From efce0a9d5f37ff147e7c653941456ff6e9808bbb Mon Sep 17 00:00:00 2001
From: Mihail Bodrov <connormiha1@gmail.com>
Date: Sun, 4 Feb 2018 19:39:03 +0300
Subject: [PATCH 001/383] Simplify check lang.mimetypes

---
 src/vs/editor/common/services/languagesRegistry.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts
index 546aa1bbc17..a99127c1536 100644
--- a/src/vs/editor/common/services/languagesRegistry.ts
+++ b/src/vs/editor/common/services/languagesRegistry.ts
@@ -111,13 +111,9 @@ export class LanguagesRegistry {
 
 		let primaryMime: string = null;
 
-		if (typeof lang.mimetypes !== 'undefined' && Array.isArray(lang.mimetypes)) {
-			for (let i = 0; i < lang.mimetypes.length; i++) {
-				if (!primaryMime) {
-					primaryMime = lang.mimetypes[i];
-				}
-				resolvedLanguage.mimetypes.push(lang.mimetypes[i]);
-			}
+		if (Array.isArray(lang.mimetypes) && lang.mimetypes.length) {
+			resolvedLanguage.mimetypes.push(...lang.mimetypes);
+			primaryMime = lang.mimetypes[0];
 		}
 
 		if (!primaryMime) {

From 1b8f96f383ef9c9b4c652b5d25b16860d25bc5bf Mon Sep 17 00:00:00 2001
From: amalik12 <adisamalik@gmail.com>
Date: Thu, 1 Mar 2018 22:37:17 -0500
Subject: [PATCH 002/383] Added Mac specific text for link follow tooltip

---
 src/vs/editor/contrib/links/links.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index 61e679cb177..d62f77d70a4 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -38,8 +38,17 @@ const HOVER_MESSAGE_COMMAND_META = new MarkdownString().appendText(
 		: nls.localize('links.command', "Ctrl + click to execute command")
 );
 
-const HOVER_MESSAGE_GENERAL_ALT = new MarkdownString().appendText(nls.localize('links.navigate.al', "Alt + click to follow link"));
-const HOVER_MESSAGE_COMMAND_ALT = new MarkdownString().appendText(nls.localize('links.command.al', "Alt + click to execute command"));
+const HOVER_MESSAGE_GENERAL_ALT = new MarkdownString().appendText(
+	platform.isMacintosh
+		? nls.localize('links.navigate.al.mac', "Option + click to follow link")
+		: nls.localize('links.navigate.al', "Alt + click to follow link")
+);
+
+const HOVER_MESSAGE_COMMAND_ALT = new MarkdownString().appendText(
+	platform.isMacintosh
+		? nls.localize('links.command.al.mac', "Option + click to execute command")
+		: nls.localize('links.command.al', "Alt + click to execute command")
+);
 
 const decoration = {
 	meta: ModelDecorationOptions.register({

From 857d5457f77f43d824f60766a6654a904fe5aeea Mon Sep 17 00:00:00 2001
From: oriash93 <oriash93@gmail.com>
Date: Sun, 4 Mar 2018 07:47:29 +0200
Subject: [PATCH 003/383] Case insensitive comment string matching

resolves #35589
---
 src/vs/editor/contrib/comment/blockCommentCommand.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/comment/blockCommentCommand.ts b/src/vs/editor/contrib/comment/blockCommentCommand.ts
index 3c8caf720d5..d6ceea7e08d 100644
--- a/src/vs/editor/contrib/comment/blockCommentCommand.ts
+++ b/src/vs/editor/contrib/comment/blockCommentCommand.ts
@@ -32,8 +32,11 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 		if (offset + needleLength > haystackLength) {
 			return false;
 		}
+
+		const haystackUpper = haystack.toUpperCase();
+		const needleUpper = needle.toUpperCase();
 		for (let i = 0; i < needleLength; i++) {
-			if (haystack.charCodeAt(offset + i) !== needle.charCodeAt(i)) {
+			if (haystackUpper.charCodeAt(offset + i) !== needleUpper.charCodeAt(i)) {
 				return false;
 			}
 		}

From e71e3e5e34067c484a4132a9823482ed6e74686a Mon Sep 17 00:00:00 2001
From: Jackson Kearl <jkearl@mit.edu>
Date: Sun, 11 Mar 2018 00:30:17 -0500
Subject: [PATCH 004/383] Standardize transpose logic. Add basic support for
 transposing multi-byte characters.

---
 .../contrib/caretOperations/transpose.ts      | 74 +++++++++++++++----
 1 file changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/vs/editor/contrib/caretOperations/transpose.ts b/src/vs/editor/contrib/caretOperations/transpose.ts
index b0ac110f3f9..a73490e4127 100644
--- a/src/vs/editor/contrib/caretOperations/transpose.ts
+++ b/src/vs/editor/contrib/caretOperations/transpose.ts
@@ -6,15 +6,56 @@
 
 import * as nls from 'vs/nls';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { isLowSurrogate, isHighSurrogate } from 'vs/base/common/strings';
 import { Range } from 'vs/editor/common/core/range';
+import { Position, IPosition } from 'vs/editor/common/core/position';
 import { ICommand } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ITextModel } from 'vs/editor/common/model';
 
 class TransposeLettersAction extends EditorAction {
 
+	private positionLeftOf(start: IPosition, model: ITextModel): Position {
+		let column = start.column;
+		let lineNumber = start.lineNumber;
+
+		if (column > model.getLineMinColumn(lineNumber)) {
+			if (isLowSurrogate(model.getLineContent(lineNumber).charCodeAt(column - 2))) {
+				// character before column is a low surrogate
+				column = column - 2;
+			} else {
+				column = column - 1;
+			}
+		} else if (lineNumber > 1) {
+			lineNumber = lineNumber - 1;
+			column = model.getLineMaxColumn(lineNumber);
+		}
+
+		return new Position(lineNumber, column);
+	}
+
+	private positionRightOf(start: IPosition, model: ITextModel): Position {
+		let column = start.column;
+		let lineNumber = start.lineNumber;
+
+		if (column < model.getLineMaxColumn(lineNumber)) {
+			if (isHighSurrogate(model.getLineContent(lineNumber).charCodeAt(column - 1))) {
+				// character after column is a high surrogate
+				column = column + 2;
+			} else {
+				column = column + 1;
+			}
+		} else if (lineNumber < model.getLineCount()) {
+			lineNumber = lineNumber + 1;
+			column = 0;
+		}
+
+		return new Position(lineNumber, column);
+	}
+
 	constructor() {
 		super({
 			id: 'editor.action.transposeLetters',
@@ -36,30 +77,35 @@ class TransposeLettersAction extends EditorAction {
 		let commands: ICommand[] = [];
 		let selections = editor.getSelections();
 
-		for (let i = 0; i < selections.length; i++) {
-			let selection = selections[i];
+		for (let selection of selections) {
 			if (!selection.isEmpty()) {
 				continue;
 			}
+
 			let lineNumber = selection.startLineNumber;
 			let column = selection.startColumn;
-			if (column === 1) {
-				// at the beginning of line
-				continue;
-			}
-			let maxColumn = model.getLineMaxColumn(lineNumber);
-			if (column === maxColumn) {
-				// at the end of line
+
+			let lastColumn = model.getLineMaxColumn(lineNumber);
+
+			if (lineNumber === 1 && (column === 1 || (column === 2 && lastColumn === 2))) {
+				// at beginning of file, nothing to do
 				continue;
 			}
 
-			let lineContent = model.getLineContent(lineNumber);
-			let charToTheLeft = lineContent.charAt(column - 2);
-			let charToTheRight = lineContent.charAt(column - 1);
+			// handle special case: when at end of line, transpose left two chars
+			// otherwise, transpose left and right chars
+			let endPosition = (column === lastColumn) ?
+				selection.getPosition() :
+				this.positionRightOf(selection.getPosition(), model);
 
-			let replaceRange = new Range(lineNumber, column - 1, lineNumber, column + 1);
+			let middlePosition = this.positionLeftOf(endPosition, model);
+			let beginPosition = this.positionLeftOf(middlePosition, model);
 
-			commands.push(new ReplaceCommand(replaceRange, charToTheRight + charToTheLeft));
+			let leftChar = model.getValueInRange(Range.fromPositions(beginPosition, middlePosition));
+			let rightChar = model.getValueInRange(Range.fromPositions(middlePosition, endPosition));
+
+			let replaceRange = Range.fromPositions(beginPosition, endPosition);
+			commands.push(new ReplaceCommand(replaceRange, rightChar + leftChar));
 		}
 
 		if (commands.length > 0) {

From fe395f5178fb0748940d640c6ac628fee614f8d0 Mon Sep 17 00:00:00 2001
From: AiryShift <religionofaperturelabs@gmail.com>
Date: Wed, 21 Mar 2018 14:41:04 +1100
Subject: [PATCH 005/383] Fix #46075

---
 .../workbench/api/electron-browser/mainThreadSaveParticipant.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index c93c090818e..8f647499400 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -165,7 +165,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
 			currentLineIsEmptyOrWhitespace = strings.lastNonWhitespaceIndex(currentLine) === -1;
 		}
 
-		const deletionRange = new Range(currentLineNumber + 1, 1, lineCount + 1, 1);
+		const deletionRange = new Range(currentLineNumber + 1, 1, lineCount, 1);
 		if (!deletionRange.isEmpty()) {
 			model.pushEditOperations(prevSelection, [EditOperation.delete(deletionRange)], edits => prevSelection);
 		}

From 55e85a94a6db89ff220d63b6f90e318bca58babe Mon Sep 17 00:00:00 2001
From: AiryShift <religionofaperturelabs@gmail.com>
Date: Wed, 21 Mar 2018 14:41:47 +1100
Subject: [PATCH 006/383] Add test to check for 46075: NOT WORKING

This should reproduce the bug as described in #46075 but doesn't
---
 .../api/mainThreadSaveParticipant.test.ts     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
index 995c2d814a8..f0465f76568 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
@@ -139,4 +139,31 @@ suite('MainThreadSaveParticipant', function () {
 		});
 	});
 
+	test('trim final new lines bug#46075', function () {
+		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/trim_final_new_line.txt'), 'utf8');
+
+		return model.load().then(() => {
+			const configService = new TestConfigurationService();
+			configService.setUserConfiguration('files', { 'trimFinalNewlines': true });
+
+			const participant = new TrimFinalNewLinesParticipant(configService, undefined);
+
+			const textContent = 'Test';
+			const eol = `${model.textEditorModel.getEOL()}`;
+
+			let content = `${textContent}${eol}${eol}`;
+			model.textEditorModel.setValue(content);
+			// save many times
+			for (let i = 0; i < 10; i++) {
+				participant.participate(model, { reason: SaveReason.EXPLICIT });
+			}
+			// confirm trimming
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}`);
+			// undo should go back to previous content immediately
+			model.textEditorModel.undo();
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}${eol}`);
+			model.textEditorModel.redo();
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}`);
+		});
+	});
 });

From 0c9d7f2b72bfc692c85d5ba2fb22f05410ada069 Mon Sep 17 00:00:00 2001
From: Aleksey Glazkov <alexglazkov9703@gmail.com>
Date: Sun, 25 Mar 2018 23:41:53 -0400
Subject: [PATCH 007/383] fixed terminal dodn't open when window has no
 folders, closes #46139

---
 .../execution/electron-browser/execution.contribution.ts      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
index 003b60d75b2..8f4c9ff89bd 100644
--- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
@@ -117,6 +117,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const root = historyService.getLastActiveWorkspaceRoot(Schemas.file);
 		if (root) {
 			terminalService.openTerminal(root.fsPath);
+		} else {
+			//Opens current file's folder, if no folder is open in editor
+			const path = historyService.getLastActiveFile().path;
+			terminalService.openTerminal(paths.dirname(path));
 		}
 	}
 });

From 398e99dc4e22378320be190ab1c8b12e44e6281d Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 26 Mar 2018 12:12:07 +0200
Subject: [PATCH 008/383] debug: introduce breakpoint editor

---
 .../parts/debug/browser/debugEditorActions.ts |  26 +-
 .../debug/browser/media/breakpointWidget.css  |  24 +-
 .../electron-browser/breakpointWidget.ts      | 257 +++++++++++-------
 3 files changed, 164 insertions(+), 143 deletions(-)

diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
index 74b2f2b7c1f..a8342fec394 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
@@ -8,12 +8,11 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { Range } from 'vs/editor/common/core/range';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ServicesAccessor, registerEditorAction, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
+import { ServicesAccessor, registerEditorAction, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, BreakpointWidgetContext } from 'vs/workbench/parts/debug/common/debug';
+import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext } from 'vs/workbench/parts/debug/common/debug';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 class ToggleBreakpointAction extends EditorAction {
@@ -210,26 +209,6 @@ class ShowDebugHoverAction extends EditorAction {
 	}
 }
 
-class CloseBreakpointWidgetCommand extends EditorCommand {
-
-	constructor() {
-		super({
-			id: 'closeBreakpointWidget',
-			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
-			kbOpts: {
-				weight: KeybindingsRegistry.WEIGHT.editorContrib(8),
-				kbExpr: EditorContextKeys.focus,
-				primary: KeyCode.Escape,
-				secondary: [KeyMod.Shift | KeyCode.Escape]
-			}
-		});
-	}
-
-	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
-		return editor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID).closeBreakpointWidget();
-	}
-}
-
 registerEditorAction(ToggleBreakpointAction);
 registerEditorAction(ConditionalBreakpointAction);
 registerEditorAction(LogPointAction);
@@ -237,4 +216,3 @@ registerEditorAction(RunToCursorAction);
 registerEditorAction(SelectionToReplAction);
 registerEditorAction(SelectionToWatchExpressionsAction);
 registerEditorAction(ShowDebugHoverAction);
-registerEditorCommand(new CloseBreakpointWidgetCommand());
diff --git a/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css b/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
index 8d190b91ca0..2efc6078cf7 100644
--- a/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
+++ b/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
@@ -16,26 +16,8 @@
 	padding: 0 10px;
 }
 
-.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputBoxContainer {
+.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputContainer {
 	flex: 1;
-}
-
-.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .monaco-inputbox {
-	border: none;
-}
-
-.monaco-editor .breakpoint-widget .input {
-	font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
-	line-height: 22px;
-	background-color: transparent;
-	padding: 8px;
-}
-
-.monaco-workbench.mac .monaco-editor .breakpoint-widget .input {
-	font-size: 11px;
-}
-
-.monaco-workbench.windows .monaco-editor .breakpoint-widget .input,
-.monaco-workbench.linux .monaco-editor .breakpoint-widget .input {
-	font-size: 13px;
+	margin-top: 6px;
+	margin-bottom: 6px;
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index 30eb70d4ff6..9d55a58bdc0 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -6,26 +6,37 @@
 import 'vs/css!../browser/media/breakpointWidget';
 import * as nls from 'vs/nls';
 import * as errors from 'vs/base/common/errors';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { isWindows, isMacintosh } from 'vs/base/common/platform';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import * as dom from 'vs/base/browser/dom';
-import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IDebugService, IBreakpoint, BreakpointWidgetContext as Context } from 'vs/workbench/parts/debug/common/debug';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { once } from 'vs/base/common/functional';
-import { attachInputBoxStyler, attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
+import { IDebugService, IBreakpoint, BreakpointWidgetContext as Context, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DEBUG_SCHEME, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID } from 'vs/workbench/parts/debug/common/debug';
+import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { SimpleDebugEditor } from 'vs/workbench/parts/debug/electron-browser/simpleDebugEditor';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection';
+import { ServicesAccessor, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import uri from 'vs/base/common/uri';
 
 const $ = dom.$;
+const IPrivateBreakopintWidgetService = createDecorator<IPrivateBreakopintWidgetService>('privateBreakopintWidgetService');
+export interface IPrivateBreakopintWidgetService {
+	_serviceBrand: any;
+	close(success: boolean): void;
+}
 
-export class BreakpointWidget extends ZoneWidget {
+export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWidgetService {
+	public _serviceBrand: any;
 
-	private inputBox: InputBox;
+	private selectContainer: HTMLElement;
+	private input: SimpleDebugEditor;
 	private toDispose: lifecycle.IDisposable[];
 	private conditionInput = '';
 	private hitCountInput = '';
@@ -35,7 +46,10 @@ export class BreakpointWidget extends ZoneWidget {
 	constructor(editor: ICodeEditor, private lineNumber: number, private column: number, private context: Context,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IDebugService private debugService: IDebugService,
-		@IThemeService private themeService: IThemeService
+		@IThemeService private themeService: IThemeService,
+		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IModelService private modelService: IModelService
 	) {
 		super(editor, { showFrame: true, showArrow: false, frameWidth: 1 });
 
@@ -61,27 +75,28 @@ export class BreakpointWidget extends ZoneWidget {
 		this.create();
 	}
 
-	private get placeholder(): string {
-		switch (this.context) {
-			case Context.LOG_MESSAGE:
-				return nls.localize('breakpointWidgetLogMessagePlaceholder', "Message to log when breakpoint is hit. 'Enter' to accept, 'esc' to cancel.");
-			case Context.HIT_COUNT:
-				return nls.localize('breakpointWidgetHitCountPlaceholder', "Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.");
-			default:
-				return nls.localize('breakpointWidgetExpressionPlaceholder', "Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.");
-		}
-	}
+	// TODO@Isidor integrate placeholder and ariaLabel
+	// private get placeholder(): string {
+	// 	switch (this.context) {
+	// 		case Context.LOG_MESSAGE:
+	// 			return nls.localize('breakpointWidgetLogMessagePlaceholder', "Message to log when breakpoint is hit. 'Enter' to accept, 'esc' to cancel.");
+	// 		case Context.HIT_COUNT:
+	// 			return nls.localize('breakpointWidgetHitCountPlaceholder', "Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.");
+	// 		default:
+	// 			return nls.localize('breakpointWidgetExpressionPlaceholder', "Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.");
+	// 	}
+	// }
 
-	private get ariaLabel(): string {
-		switch (this.context) {
-			case Context.LOG_MESSAGE:
-				return nls.localize('breakpointWidgetLogMessageAriaLabel', "The program will log this message everytime this breakpoint is hit. Press Enter to accept or Escape to cancel.");
-			case Context.HIT_COUNT:
-				return nls.localize('breakpointWidgetHitCountAriaLabel', "The program will only stop here if the hit count is met. Press Enter to accept or Escape to cancel.");
-			default:
-				return nls.localize('breakpointWidgetAriaLabel', "The program will only stop here if this condition is true. Press Enter to accept or Escape to cancel.");
-		}
-	}
+	// private get ariaLabel(): string {
+	// 	switch (this.context) {
+	// 		case Context.LOG_MESSAGE:
+	// 			return nls.localize('breakpointWidgetLogMessageAriaLabel', "The program will log this message everytime this breakpoint is hit. Press Enter to accept or Escape to cancel.");
+	// 		case Context.HIT_COUNT:
+	// 			return nls.localize('breakpointWidgetHitCountAriaLabel', "The program will only stop here if the hit count is met. Press Enter to accept or Escape to cancel.");
+	// 		default:
+	// 			return nls.localize('breakpointWidgetAriaLabel', "The program will only stop here if this condition is true. Press Enter to accept or Escape to cancel.");
+	// 	}
+	// }
 
 	private getInputValue(breakpoint: IBreakpoint): string {
 		switch (this.context) {
@@ -95,15 +110,16 @@ export class BreakpointWidget extends ZoneWidget {
 	}
 
 	private rememberInput(): void {
+		const value = this.input.getModel().getValue();
 		switch (this.context) {
 			case Context.LOG_MESSAGE:
-				this.logMessageInput = this.inputBox.value;
+				this.logMessageInput = value;
 				break;
 			case Context.HIT_COUNT:
-				this.hitCountInput = this.inputBox.value;
+				this.hitCountInput = value;
 				break;
 			default:
-				this.conditionInput = this.inputBox.value;
+				this.conditionInput = value;
 		}
 	}
 
@@ -111,89 +127,134 @@ export class BreakpointWidget extends ZoneWidget {
 		this.setCssClass('breakpoint-widget');
 		const selectBox = new SelectBox([nls.localize('expression', "Expression"), nls.localize('hitCount', "Hit Count"), nls.localize('logMessage', "Log Message")], this.context, this.contextViewService);
 		this.toDispose.push(attachSelectBoxStyler(selectBox, this.themeService));
-		selectBox.render(dom.append(container, $('.breakpoint-select-container')));
+		this.selectContainer = $('.breakpoint-select-container');
+		selectBox.render(dom.append(container, this.selectContainer));
 		selectBox.onDidSelect(e => {
 			this.rememberInput();
 			this.context = e.index;
 
-			this.inputBox.setAriaLabel(this.ariaLabel);
-			this.inputBox.setPlaceHolder(this.placeholder);
-			this.inputBox.value = this.getInputValue(this.breakpoint);
+			this.input.getModel().setValue(this.getInputValue(this.breakpoint));
 		});
 
-		const inputBoxContainer = dom.append(container, $('.inputBoxContainer'));
-		this.inputBox = new InputBox(inputBoxContainer, this.contextViewService, {
-			placeholder: this.placeholder,
-			ariaLabel: this.ariaLabel
-		});
-		this.toDispose.push(attachInputBoxStyler(this.inputBox, this.themeService));
-		this.toDispose.push(this.inputBox);
+		this.createBreakpointInput(dom.append(container, $('.inputContainer')));
 
-		dom.addClass(this.inputBox.inputElement, isWindows ? 'windows' : isMacintosh ? 'mac' : 'linux');
-		this.inputBox.value = this.getInputValue(this.breakpoint);
+		this.input.getModel().setValue(this.getInputValue(this.breakpoint));
 		// Due to an electron bug we have to do the timeout, otherwise we do not get focus
-		setTimeout(() => this.inputBox.focus(), 0);
+		setTimeout(() => this.input.focus(), 50);
+	}
 
-		let disposed = false;
-		const wrapUp = once((success: boolean) => {
-			if (!disposed) {
-				disposed = true;
-				if (success) {
-					// if there is already a breakpoint on this location - remove it.
+	public close(success: boolean): void {
+		// TODO@isidor check if we should check the disposed check
+		if (success) {
+			// if there is already a breakpoint on this location - remove it.
 
-					let condition = this.breakpoint && this.breakpoint.condition;
-					let hitCondition = this.breakpoint && this.breakpoint.hitCondition;
-					let logMessage = this.breakpoint && this.breakpoint.logMessage;
-					this.rememberInput();
+			let condition = this.breakpoint && this.breakpoint.condition;
+			let hitCondition = this.breakpoint && this.breakpoint.hitCondition;
+			let logMessage = this.breakpoint && this.breakpoint.logMessage;
+			this.rememberInput();
 
-					if (this.conditionInput) {
-						condition = this.conditionInput;
-					}
-					if (this.hitCountInput) {
-						hitCondition = this.hitCountInput;
-					}
-					if (this.logMessageInput) {
-						logMessage = this.logMessageInput;
-					}
-
-					if (this.breakpoint) {
-						this.debugService.updateBreakpoints(this.breakpoint.uri, {
-							[this.breakpoint.getId()]: {
-								condition,
-								hitCondition,
-								verified: this.breakpoint.verified,
-								logMessage
-							}
-						}, false);
-					} else {
-						this.debugService.addBreakpoints(this.editor.getModel().uri, [{
-							lineNumber: this.lineNumber,
-							column: this.breakpoint ? this.breakpoint.column : undefined,
-							enabled: true,
-							condition,
-							hitCondition,
-							logMessage
-						}]).done(null, errors.onUnexpectedError);
-					}
-				}
-
-				this.dispose();
+			if (this.conditionInput) {
+				condition = this.conditionInput;
 			}
-		});
-
-		this.toDispose.push(dom.addStandardDisposableListener(this.inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
-			const isEscape = e.equals(KeyCode.Escape);
-			const isEnter = e.equals(KeyCode.Enter);
-			if (isEscape || isEnter) {
-				e.stopPropagation();
-				wrapUp(isEnter);
+			if (this.hitCountInput) {
+				hitCondition = this.hitCountInput;
 			}
-		}));
+			if (this.logMessageInput) {
+				logMessage = this.logMessageInput;
+			}
+
+			if (this.breakpoint) {
+				this.debugService.updateBreakpoints(this.breakpoint.uri, {
+					[this.breakpoint.getId()]: {
+						condition,
+						hitCondition,
+						verified: this.breakpoint.verified,
+						logMessage
+					}
+				}, false);
+			} else {
+				this.debugService.addBreakpoints(this.editor.getModel().uri, [{
+					lineNumber: this.lineNumber,
+					column: this.breakpoint ? this.breakpoint.column : undefined,
+					enabled: true,
+					condition,
+					hitCondition,
+					logMessage
+				}]).done(null, errors.onUnexpectedError);
+			}
+		}
+
+		this.dispose();
+	}
+
+	protected _doLayout(heightInPixel: number, widthInPixel: number): void {
+		this.input.layout({ height: 18, width: widthInPixel - 133 });
+	}
+
+	private createBreakpointInput(container: HTMLElement): void {
+		const scopedContextKeyService = this.contextKeyService.createScoped(container);
+		this.toDispose.push(scopedContextKeyService);
+
+		const scopedInstatiationService = this.instantiationService.createChild(new ServiceCollection(
+			[IContextKeyService, scopedContextKeyService], [IPrivateBreakopintWidgetService, this]));
+
+		const options = SimpleDebugEditor.getEditorOptions();
+		this.input = scopedInstatiationService.createInstance(SimpleDebugEditor, container, options);
+		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:breakpointinput`), true);
+		this.input.setModel(model);
+		this.toDispose.push(model);
 	}
 
 	public dispose(): void {
 		super.dispose();
+		this.input.dispose();
 		lifecycle.dispose(this.toDispose);
 		setTimeout(() => this.editor.focus(), 0);
 	}
 }
+
+class AcceptBreakpointWidgetInputAction extends EditorCommand {
+
+	constructor() {
+		super({
+			id: 'breakpointWidget.action.acceptInput',
+			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE, // TODO@Isidor need a more specific context key if breakpoint widget is focused
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: KeyCode.Enter
+			}
+		});
+	}
+
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		accessor.get(IPrivateBreakopintWidgetService).close(true);
+	}
+}
+
+class CloseBreakpointWidgetCommand extends EditorCommand {
+
+	constructor() {
+		super({
+			id: 'closeBreakpointWidget',
+			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: KeyCode.Escape,
+				secondary: [KeyMod.Shift | KeyCode.Escape]
+			}
+		});
+	}
+
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
+		const debugContribution = editor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID);
+		if (debugContribution) {
+			// if focus is in outer editor we need to use the debug contribution to close
+			return debugContribution.closeBreakpointWidget();
+		}
+
+		accessor.get(IPrivateBreakopintWidgetService).close(false);
+	}
+}
+
+registerEditorCommand(new AcceptBreakpointWidgetInputAction());
+registerEditorCommand(new CloseBreakpointWidgetCommand());

From d2d9d65efcaf1b67d17e483b2c6b22192c714f59 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Mon, 26 Mar 2018 10:53:38 -0700
Subject: [PATCH 009/383] Update windows-process-tree version to 0.2.0

---
 package.json                                  |  2 +-
 src/typings/windows-process-tree.d.ts         | 59 +++++++++++++++++--
 .../electron-browser/windowsShellHelper.ts    |  2 +-
 yarn.lock                                     |  6 +-
 4 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 2339b0f7cbb..17b5ee8a4df 100644
--- a/package.json
+++ b/package.json
@@ -132,6 +132,6 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.1.0",
     "windows-mutex": "^0.2.0",
-    "windows-process-tree": "0.1.6"
+    "windows-process-tree": "0.2.0"
   }
 }
diff --git a/src/typings/windows-process-tree.d.ts b/src/typings/windows-process-tree.d.ts
index aec2670a5cd..b9db4ea76a8 100644
--- a/src/typings/windows-process-tree.d.ts
+++ b/src/typings/windows-process-tree.d.ts
@@ -4,13 +4,60 @@
  *--------------------------------------------------------------------------------------------*/
 
 declare module 'windows-process-tree' {
-	interface ProcessTreeNode {
-		pid: number,
-		name: string,
-		children: ProcessTreeNode[]
+	export enum ProcessDataFlag {
+		None = 0,
+		Memory = 1,
+		CommandLine = 2
 	}
 
-	function get(rootPid: number, callback: (tree: ProcessTreeNode) => void): void;
+	export interface IProcessInfo {
+		pid: number;
+		ppid: number;
+		name: string;
 
-	export = get;
+		/**
+		 * The working set size of the process, in bytes.
+		 */
+		memory?: number;
+
+		/**
+		 * The string returned is at most 512 chars, strings exceeding this length are truncated.
+		 */
+		commandLine?: string;
+	}
+
+	export interface IProcessCpuInfo extends IProcessInfo {
+		cpu?: number;
+	}
+
+	export interface IProcessTreeNode {
+		pid: number;
+		name: string;
+		memory?: number;
+		commandLine?: string;
+		children: IProcessTreeNode[];
+	}
+
+	/**
+	 * Returns a tree of processes with the rootPid process as the root.
+	 * @param rootPid - The pid of the process that will be the root of the tree.
+	 * @param callback - The callback to use with the returned list of processes.
+	 * @param flags - The flags for what process data should be included.
+	 */
+	export function getProcessTree(rootPid: number, callback: (tree: IProcessTreeNode) => void, flags?: ProcessDataFlag): void;
+
+	/**
+	 * Returns a list of processes containing the rootPid process and all of its descendants.
+	 * @param rootPid - The pid of the process of interest.
+	 * @param callback - The callback to use with the returned set of processes.
+	 * @param flags - The flags for what process data should be included.
+	 */
+	export function getProcessList(rootPid: number, callback: (processList: IProcessInfo[]) => void, flags?: ProcessDataFlag): void;
+
+	/**
+	 * Returns the list of processes annotated with cpu usage information.
+	 * @param processList - The list of processes.
+	 * @param callback - The callback to use with the returned list of processes.
+	 */
+	export function getProcessCpuUsage(processList: IProcessInfo[], callback: (processListWithCpu: IProcessCpuInfo[]) => void): void;
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
index 803ad86dd9c..ebd8347f02f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
@@ -115,7 +115,7 @@ export class WindowsShellHelper {
 			return this._currentRequest;
 		}
 		this._currentRequest = new TPromise<string>(resolve => {
-			windowsProcessTree(this._rootProcessId, (tree) => {
+			windowsProcessTree.getProcessTree(this._rootProcessId, (tree) => {
 				const name = this.traverseTree(tree);
 				this._currentRequest = null;
 				resolve(name);
diff --git a/yarn.lock b/yarn.lock
index 29d519dd7b8..611eae8b5b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5969,9 +5969,9 @@ windows-mutex@^0.2.0:
     bindings "^1.2.1"
     nan "^2.1.0"
 
-windows-process-tree@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.1.6.tgz#c2d942a944152ea749a4c1c0bdb769b2f570639f"
+windows-process-tree@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.0.tgz#04dc0507df292a7984daf0d35861bd1ebaff7ae8"
   dependencies:
     nan "^2.6.2"
 

From e42c66306b0b34819cbee7722fcecafc923298a7 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 21 Mar 2018 21:58:19 -0700
Subject: [PATCH 010/383] Add context menu to search tree

---
 src/vs/platform/actions/common/actions.ts     |  1 +
 .../parts/search/browser/searchActions.ts     | 16 +++--
 .../parts/search/browser/searchResultsView.ts | 69 ++++++++++++++++++-
 .../parts/search/browser/searchView.ts        |  4 +-
 .../electron-browser/search.contribution.ts   | 36 ++++++++++
 5 files changed, 119 insertions(+), 7 deletions(-)

diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index d125b035683..1ea711884b8 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -59,6 +59,7 @@ export class MenuId {
 	static readonly ViewTitle = new MenuId();
 	static readonly ViewItemContext = new MenuId();
 	static readonly TouchBarContext = new MenuId();
+	static readonly SearchContext = new MenuId();
 
 	readonly id: string = String(MenuId.ID++);
 }
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 8dcb979e257..868a64b10a7 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -474,8 +474,10 @@ export abstract class AbstractSearchAndReplaceAction extends Action {
 
 export class RemoveAction extends AbstractSearchAndReplaceAction {
 
+	public static LABEL = nls.localize('RemoveAction.label', "Dismiss");
+
 	constructor(private viewer: ITree, private element: RenderableMatch) {
-		super('remove', nls.localize('RemoveAction.label', "Dismiss"), 'action-remove');
+		super('remove', RemoveAction.LABEL, 'action-remove');
 	}
 
 	public run(): TPromise<any> {
@@ -508,9 +510,11 @@ export class RemoveAction extends AbstractSearchAndReplaceAction {
 
 export class ReplaceAllAction extends AbstractSearchAndReplaceAction {
 
+	public static readonly LABEL = nls.localize('file.replaceAll.label', "Replace All");
+
 	constructor(private viewer: ITree, private fileMatch: FileMatch, private viewlet: SearchView,
 		@IKeybindingService keyBindingService: IKeybindingService) {
-		super(Constants.ReplaceAllInFileActionId, appendKeyBindingLabel(nls.localize('file.replaceAll.label', "Replace All"), keyBindingService.lookupKeybinding(Constants.ReplaceAllInFileActionId), keyBindingService), 'action-replace-all');
+		super(Constants.ReplaceAllInFileActionId, appendKeyBindingLabel(ReplaceAllAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFileActionId), keyBindingService), 'action-replace-all');
 	}
 
 	public run(): TPromise<any> {
@@ -527,10 +531,12 @@ export class ReplaceAllAction extends AbstractSearchAndReplaceAction {
 
 export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
 
+	public static readonly LABEL = nls.localize('file.replaceAll.label', "Replace All");
+
 	constructor(private viewer: ITree, private folderMatch: FolderMatch,
 		@IKeybindingService keyBindingService: IKeybindingService
 	) {
-		super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(nls.localize('file.replaceAll.label', "Replace All"), keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all');
+		super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(ReplaceAllInFolderAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all');
 	}
 
 	public async run(): TPromise<any> {
@@ -546,11 +552,13 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
 
 export class ReplaceAction extends AbstractSearchAndReplaceAction {
 
+	public static readonly LABEL = nls.localize('match.replace.label', "Replace");
+
 	constructor(private viewer: ITree, private element: Match, private viewlet: SearchView,
 		@IReplaceService private replaceService: IReplaceService,
 		@IKeybindingService keyBindingService: IKeybindingService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService) {
-		super(Constants.ReplaceActionId, appendKeyBindingLabel(nls.localize('match.replace.label', "Replace"), keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'action-replace');
+		super(Constants.ReplaceActionId, appendKeyBindingLabel(ReplaceAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'action-replace');
 	}
 
 	public run(): TPromise<any> {
diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index 188f2c1c147..bdb7d0d2cc9 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -9,10 +9,10 @@ import * as DOM from 'vs/base/browser/dom';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ActionBar, ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { FileLabel } from 'vs/workbench/browser/labels';
-import { ITree, IDataSource, ISorter, IAccessibilityProvider, IFilter, IRenderer } from 'vs/base/parts/tree/browser/tree';
+import { ITree, IDataSource, ISorter, IAccessibilityProvider, IFilter, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
 import { Match, SearchResult, FileMatch, FileMatchOrMatch, SearchModel, FolderMatch } from 'vs/workbench/parts/search/common/searchModel';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { Range } from 'vs/editor/common/core/range';
@@ -23,6 +23,11 @@ import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { getPathLabel } from 'vs/base/common/labels';
 import { FileKind } from 'vs/platform/files/common/files';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { WorkbenchTreeController, WorkbenchTree } from 'vs/platform/list/browser/listService';
 
 export class SearchDataSource implements IDataSource {
 
@@ -354,3 +359,63 @@ export class SearchFilter implements IFilter {
 		return !(element instanceof FileMatch || element instanceof FolderMatch) || element.matches().length > 0;
 	}
 }
+
+export class SearchTreeController extends WorkbenchTreeController {
+	constructor(
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IMenuService private menuService: IMenuService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super({}, configurationService);
+	}
+
+	public onContextMenu(tree: WorkbenchTree, element: any, event: ContextMenuEvent): boolean {
+		tree.setFocus(element);
+		const actions = this._getMenuActions(tree);
+		if (!actions.length) {
+			return true;
+		}
+
+		const anchor = { x: event.posx, y: event.posy };
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => anchor,
+
+			getActions: () => {
+				return TPromise.as(actions);
+			},
+
+			getActionItem: (action) => {
+				const keybinding = this._keybindingService.lookupKeybinding(action.id);
+				if (keybinding) {
+					return new ActionItem(action, action, { label: true, keybinding: keybinding.getLabel() });
+				}
+				return null;
+			},
+
+			onHide: (wasCancelled?: boolean) => {
+				if (wasCancelled) {
+					tree.domFocus();
+				}
+			}
+		});
+
+		return true;
+	}
+
+	private _getMenuActions(tree: WorkbenchTree): IAction[] {
+		const result: IAction[] = [];
+		const menu = this.menuService.createMenu(MenuId.SearchContext, tree.contextKeyService);
+		const groups = menu.getActions();
+		menu.dispose();
+
+		for (let group of groups) {
+			const [, actions] = group;
+			result.push(...actions);
+			result.push(new Separator());
+		}
+
+		result.pop(); // remove last separator
+		return result;
+	}
+}
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index f6b01d6a0f2..1ef8b568a8f 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -41,7 +41,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { PatternInputWidget, ExcludePatternInputWidget } from 'vs/workbench/parts/search/browser/patternInputWidget';
-import { SearchRenderer, SearchDataSource, SearchSorter, SearchAccessibilityProvider, SearchFilter } from 'vs/workbench/parts/search/browser/searchResultsView';
+import { SearchRenderer, SearchDataSource, SearchSorter, SearchAccessibilityProvider, SearchFilter, SearchTreeController } from 'vs/workbench/parts/search/browser/searchResultsView';
 import { SearchWidget, ISearchWidgetOptions } from 'vs/workbench/parts/search/browser/searchWidget';
 import { RefreshAction, CollapseDeepestExpandedLevelAction, ClearSearchResultsAction, CancelSearchAction } from 'vs/workbench/parts/search/browser/searchActions';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
@@ -83,6 +83,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	private folderMatchFocused: IContextKey<boolean>;
 	private matchFocused: IContextKey<boolean>;
 	private hasSearchResultsKey: IContextKey<boolean>;
+
 	private searchSubmitted: boolean;
 	private searching: boolean;
 
@@ -493,6 +494,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				renderer: renderer,
 				sorter: new SearchSorter(),
 				filter: new SearchFilter(),
+				controller: this.instantiationService.createInstance(SearchTreeController),
 				accessibilityProvider: this.instantiationService.createInstance(SearchAccessibilityProvider),
 				dnd
 			}, {
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index e38d72e2114..30bb35e24fb 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -126,6 +126,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.RemoveActionId,
+		title: RemoveAction.LABEL
+	},
+	when: Constants.FileMatchOrMatchFocusKey,
+	group: 'search'
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -139,6 +148,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceActionId,
+		title: ReplaceAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.MatchFocusKey),
+	group: 'search'
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFileActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -151,6 +169,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceAllInFileActionId,
+		title: ReplaceAllAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FileFocusKey),
+	group: 'search'
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFolderActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -163,6 +190,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceAllInFolderActionId,
+		title: ReplaceAllInFolderAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FolderFocusKey),
+	group: 'search'
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CloseReplaceWidgetActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),

From 6294fa2097954fe6ec1d789a8e81556e1c68c79b Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 22 Mar 2018 09:22:52 -0700
Subject: [PATCH 011/383] PR feedback

---
 .../parts/search/browser/searchResultsView.ts | 50 +++---------
 .../parts/search/browser/searchView.ts        |  2 +-
 .../electron-browser/search.contribution.ts   | 76 ++++++++++---------
 3 files changed, 53 insertions(+), 75 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index bdb7d0d2cc9..9ce97eec3b1 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -9,7 +9,7 @@ import * as DOM from 'vs/base/browser/dom';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
-import { ActionBar, ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { FileLabel } from 'vs/workbench/browser/labels';
 import { ITree, IDataSource, ISorter, IAccessibilityProvider, IFilter, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
@@ -25,9 +25,9 @@ import { getPathLabel } from 'vs/base/common/labels';
 import { FileKind } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
 import { WorkbenchTreeController, WorkbenchTree } from 'vs/platform/list/browser/listService';
+import { fillInActions } from 'vs/platform/actions/browser/menuItemActionItem';
 
 export class SearchDataSource implements IDataSource {
 
@@ -361,61 +361,35 @@ export class SearchFilter implements IFilter {
 }
 
 export class SearchTreeController extends WorkbenchTreeController {
+	private contextMenu: IMenu;
+
 	constructor(
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IMenuService private menuService: IMenuService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super({}, configurationService);
 	}
 
 	public onContextMenu(tree: WorkbenchTree, element: any, event: ContextMenuEvent): boolean {
-		tree.setFocus(element);
-		const actions = this._getMenuActions(tree);
-		if (!actions.length) {
-			return true;
+		if (!this.contextMenu) {
+			this.contextMenu = this.menuService.createMenu(MenuId.SearchContext, tree.contextKeyService);
 		}
 
+		tree.setFocus(element);
+
 		const anchor = { x: event.posx, y: event.posy };
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => anchor,
 
 			getActions: () => {
+				const actions: IAction[] = [];
+				fillInActions(this.contextMenu, { shouldForwardArgs: true }, actions, this.contextMenuService);
 				return TPromise.as(actions);
 			},
-
-			getActionItem: (action) => {
-				const keybinding = this._keybindingService.lookupKeybinding(action.id);
-				if (keybinding) {
-					return new ActionItem(action, action, { label: true, keybinding: keybinding.getLabel() });
-				}
-				return null;
-			},
-
-			onHide: (wasCancelled?: boolean) => {
-				if (wasCancelled) {
-					tree.domFocus();
-				}
-			}
+			// getActionsContext: () => element instanceof OpenEditor ? { groupId: element.group.id, editorIndex: element.editorIndex } : { groupId: element.id }
 		});
 
 		return true;
 	}
-
-	private _getMenuActions(tree: WorkbenchTree): IAction[] {
-		const result: IAction[] = [];
-		const menu = this.menuService.createMenu(MenuId.SearchContext, tree.contextKeyService);
-		const groups = menu.getActions();
-		menu.dispose();
-
-		for (let group of groups) {
-			const [, actions] = group;
-			result.push(...actions);
-			result.push(new Separator());
-		}
-
-		result.pop(); // remove last separator
-		return result;
-	}
 }
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 1ef8b568a8f..a41280fc18c 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -528,7 +528,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				if (treeHasFocus) {
 					const focus = e.focus;
 					this.firstMatchFocused.set(this.tree.getNavigator().first() === focus);
-					this.fileMatchOrMatchFocused.set(true);
+					this.fileMatchOrMatchFocused.set(!!focus);
 					this.fileMatchFocused.set(focus instanceof FileMatch);
 					this.folderMatchFocused.set(focus instanceof FolderMatch);
 					this.matchFocused.set(focus instanceof Match);
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index 30bb35e24fb..dad5c628fea 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -126,15 +126,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.SearchContext, {
-	command: {
-		id: Constants.RemoveActionId,
-		title: RemoveAction.LABEL
-	},
-	when: Constants.FileMatchOrMatchFocusKey,
-	group: 'search'
-});
-
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -148,15 +139,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.SearchContext, {
-	command: {
-		id: Constants.ReplaceActionId,
-		title: ReplaceAction.LABEL
-	},
-	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.MatchFocusKey),
-	group: 'search'
-});
-
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFileActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -169,15 +151,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.SearchContext, {
-	command: {
-		id: Constants.ReplaceAllInFileActionId,
-		title: ReplaceAllAction.LABEL
-	},
-	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FileFocusKey),
-	group: 'search'
-});
-
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFolderActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -190,15 +163,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.SearchContext, {
-	command: {
-		id: Constants.ReplaceAllInFolderActionId,
-		title: ReplaceAllInFolderAction.LABEL
-	},
-	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FolderFocusKey),
-	group: 'search'
-});
-
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CloseReplaceWidgetActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -229,6 +193,46 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceActionId,
+		title: ReplaceAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.MatchFocusKey),
+	group: 'search',
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceAllInFolderActionId,
+		title: ReplaceAllInFolderAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FolderFocusKey),
+	group: 'search',
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceAllInFileActionId,
+		title: ReplaceAllAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FileFocusKey),
+	group: 'search',
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.RemoveActionId,
+		title: RemoveAction.LABEL
+	},
+	when: Constants.FileMatchOrMatchFocusKey,
+	group: 'search',
+	order: 2
+});
+
 const FIND_IN_FOLDER_ID = 'filesExplorer.findInFolder';
 CommandsRegistry.registerCommand({
 	id: FIND_IN_FOLDER_ID,

From 60b9d1ba02cdb846c240f307daf253fd02a193c5 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Mon, 26 Mar 2018 11:49:44 -0700
Subject: [PATCH 012/383] Add support for filing an issue on an extension
 within the issue reporter, #45673

---
 .../issue/issueReporterMain.ts                | 123 ++++++++++++------
 .../issue/issueReporterModel.ts               |  18 ++-
 .../issue/issueReporterPage.ts                |  41 +++---
 .../issue/media/issueReporter.css             |  35 +----
 .../issue/test/testReporterModel.test.ts      |   3 +-
 .../common/extensionManagement.ts             |   3 +
 6 files changed, 122 insertions(+), 101 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index f6bbf228784..e179fc5c52a 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -213,9 +213,9 @@ export class IssueReporter extends Disposable {
 
 		if (this.environmentService.disableExtensions || extensions.length === 0) {
 			(<HTMLButtonElement>document.getElementById('disableExtensions')).disabled = true;
-			(<HTMLInputElement>document.getElementById('reproducesWithoutExtensions')).checked = true;
-			this.issueReporterModel.update({ reprosWithoutExtensions: true });
 		}
+
+		this.updateExtensionSelector(extensions);
 	}
 
 	private handleSettingsSearchData(data: ISettingsSearchIssueReporterData): void {
@@ -322,30 +322,21 @@ export class IssueReporter extends Disposable {
 			});
 		}
 
-		this.addEventListener('reproducesWithoutExtensions', 'click', (e) => {
-			this.issueReporterModel.update({ reprosWithoutExtensions: true });
-		});
-
-		this.addEventListener('reproducesWithExtensions', 'click', (e) => {
-			this.issueReporterModel.update({ reprosWithoutExtensions: false });
+		this.addEventListener('issue-source', 'change', (event: Event) => {
+			const fileOnExtension = JSON.parse((<HTMLInputElement>event.target).value);
+			this.issueReporterModel.update({ fileOnExtension: fileOnExtension, includeExtensions: !fileOnExtension });
+			this.render();
+			this.search();
 		});
 
 		this.addEventListener('description', 'input', (event: Event) => {
 			const issueDescription = (<HTMLInputElement>event.target).value;
 			this.issueReporterModel.update({ issueDescription });
-
-			const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
-			if (title || issueDescription) {
-				this.searchDuplicates(title, issueDescription);
-			} else {
-				this.clearSearchResults();
-			}
+			this.search();
 		});
 
 		this.addEventListener('issue-title', 'input', (e) => {
-			const description = this.issueReporterModel.getData().issueDescription;
 			const title = (<HTMLInputElement>event.target).value;
-
 			const lengthValidationMessage = document.getElementById('issue-title-length-validation-error');
 			if (title && this.getIssueUrlWithTitle(title).length > MAX_URL_LENGTH) {
 				show(lengthValidationMessage);
@@ -353,11 +344,7 @@ export class IssueReporter extends Disposable {
 				hide(lengthValidationMessage);
 			}
 
-			if (title || description) {
-				this.searchDuplicates(title, description);
-			} else {
-				this.clearSearchResults();
-			}
+			this.search();
 		});
 
 		this.addEventListener('github-submit-btn', 'click', () => this.createIssue());
@@ -373,16 +360,6 @@ export class IssueReporter extends Disposable {
 			}
 		});
 
-		this.addEventListener('showRunning', 'click', () => {
-			ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-		});
-
-		this.addEventListener('showRunning', 'keydown', (e: KeyboardEvent) => {
-			if (e.keyCode === 13 || e.keyCode === 32) {
-				ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-			}
-		});
-
 		// Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window
 		if (platform.isMacintosh) {
 			let prevKeyWasCommand = false;
@@ -438,6 +415,23 @@ export class IssueReporter extends Disposable {
 		return false;
 	}
 
+	private search(): void {
+		// Only search issues in VSCode for now.
+		const fileOnExtension = this.issueReporterModel.getData().fileOnExtension;
+		if (fileOnExtension) {
+			this.clearSearchResults();
+			return;
+		}
+
+		const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+		const issueDescription = (<HTMLInputElement>document.getElementById('description')).value;
+		if (title || issueDescription) {
+			this.searchDuplicates(title, issueDescription);
+		} else {
+			this.clearSearchResults();
+		}
+	}
+
 	private clearSearchResults(): void {
 		const similarIssues = document.getElementById('similar-issues');
 		similarIssues.innerHTML = '';
@@ -551,7 +545,7 @@ export class IssueReporter extends Disposable {
 
 	private renderBlocks(): void {
 		// Depending on Issue Type, we render different blocks and text
-		const { issueType } = this.issueReporterModel.getData();
+		const { issueType, fileOnExtension } = this.issueReporterModel.getData();
 		const blockContainer = document.getElementById('block-container');
 		const systemBlock = document.querySelector('.block-system');
 		const processBlock = document.querySelector('.block-process');
@@ -560,9 +554,10 @@ export class IssueReporter extends Disposable {
 		const searchedExtensionsBlock = document.querySelector('.block-searchedExtensions');
 		const settingsSearchResultsBlock = document.querySelector('.block-settingsSearchResults');
 
-		const disabledExtensions = document.getElementById('disabledExtensions');
+		const problemSource = document.getElementById('problem-source');
 		const descriptionTitle = document.getElementById('issue-description-label');
 		const descriptionSubtitle = document.getElementById('issue-description-subtitle');
+		const extensionSelector = document.getElementById('extension-selection');
 
 		// Hide all by default
 		hide(blockContainer);
@@ -572,13 +567,20 @@ export class IssueReporter extends Disposable {
 		hide(extensionsBlock);
 		hide(searchedExtensionsBlock);
 		hide(settingsSearchResultsBlock);
-		hide(disabledExtensions);
+		hide(problemSource);
 
 		if (issueType === IssueType.Bug) {
 			show(blockContainer);
 			show(systemBlock);
-			show(extensionsBlock);
-			show(disabledExtensions);
+			show(problemSource);
+
+			if (fileOnExtension) {
+				hide(extensionsBlock);
+				show(extensionSelector);
+			} else {
+				show(extensionsBlock);
+				hide(extensionSelector);
+			}
 
 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('bugDescription', "Share the steps needed to reliably reproduce the problem. Please include actual and expected results. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
@@ -588,7 +590,15 @@ export class IssueReporter extends Disposable {
 			show(processBlock);
 			show(workspaceBlock);
 			show(extensionsBlock);
-			show(disabledExtensions);
+			show(problemSource);
+
+			if (fileOnExtension) {
+				hide(extensionsBlock);
+				show(extensionSelector);
+			} else {
+				show(extensionsBlock);
+				hide(extensionSelector);
+			}
 
 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
@@ -618,9 +628,8 @@ export class IssueReporter extends Disposable {
 
 	private validateInputs(): boolean {
 		let isValid = true;
-		['issue-title', 'description'].forEach(elementId => {
+		['issue-title', 'description', 'issue-source', 'extension-selector'].forEach(elementId => {
 			isValid = this.validateInput(elementId) && isValid;
-
 		});
 
 		return isValid;
@@ -630,7 +639,10 @@ export class IssueReporter extends Disposable {
 		if (!this.validateInputs()) {
 			// If inputs are invalid, set focus to the first one and add listeners on them
 			// to detect further changes
-			(<HTMLInputElement>document.getElementsByClassName('invalid-input')[0]).focus();
+			const invalidInput = document.getElementsByClassName('invalid-input');
+			if (invalidInput.length) {
+				(<HTMLInputElement>invalidInput[0]).focus();
+			}
 
 			document.getElementById('issue-title').addEventListener('input', (event) => {
 				this.validateInput('issue-title');
@@ -664,9 +676,19 @@ export class IssueReporter extends Disposable {
 		return true;
 	}
 
-	private getIssueUrlWithTitle(issueTitle: string) {
+	private getIssueUrlWithTitle(issueTitle: string): string {
+		let repositoryUrl = product.reportIssueUrl;
+		if (this.issueReporterModel.getData().fileOnExtension) {
+			const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+			const extensionUrl = selectedExtension && selectedExtension.manifest && selectedExtension.manifest.repository && selectedExtension.manifest.repository.url;
+			if (extensionUrl) {
+				// Remove '.git' suffix
+				repositoryUrl = `${extensionUrl.indexOf('.git') !== -1 ? extensionUrl.substr(0, extensionUrl.length - 4) : extensionUrl}/issues/new/`;
+			}
+		}
+
 		const queryStringPrefix = product.reportIssueUrl.indexOf('?') === -1 ? '?' : '&';
-		return `${product.reportIssueUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
+		return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
 	}
 
 	private updateSystemInfo = (state) => {
@@ -682,6 +704,21 @@ export class IssueReporter extends Disposable {
 		target.innerHTML = `<table>${tableHtml}</table>`;
 	}
 
+	private updateExtensionSelector(extensions: ILocalExtension[]): void {
+		const makeOption = (extension: ILocalExtension) => `<option value="${extension.identifier.id}">${escape(extension.manifest.displayName)}</option>`;
+		const extensionsSelector = document.getElementById('extension-selector');
+		extensionsSelector.innerHTML = '<option></option>' + extensions.map(makeOption).join('\n');
+
+		this.addEventListener('extension-selector', 'change', (e: Event) => {
+			const selectedExtensionId = (<HTMLInputElement>e.target).value;
+			const extensions = this.issueReporterModel.getData().enabledNonThemeExtesions;
+			const matches = extensions.filter(extension => extension.identifier.id === selectedExtensionId);
+			if (matches.length) {
+				this.issueReporterModel.update({ selectedExtension: matches[0] });
+			}
+		});
+	}
+
 	private updateProcessInfo = (state) => {
 		const target = document.querySelector('.block-process .block-info');
 		target.innerHTML = `<code>${state.processInfo}</code>`;
diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index a6ec8153424..8be6fa1bea9 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -28,7 +28,8 @@ export interface IssueReporterData {
 	numberOfThemeExtesions?: number;
 	enabledNonThemeExtesions?: ILocalExtension[];
 	extensionsDisabled?: boolean;
-	reprosWithoutExtensions?: boolean;
+	fileOnExtension?: boolean;
+	selectedExtension?: ILocalExtension;
 	actualSearchResults?: ISettingSearchResult[];
 	query?: string;
 	filterResultCount?: number;
@@ -44,8 +45,7 @@ export class IssueReporterModel {
 			includeProcessInfo: true,
 			includeExtensions: true,
 			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
-			reprosWithoutExtensions: false
+			includeSettingsSearchDetails: true
 		};
 
 		this._data = initialData ? assign(defaultData, initialData) : defaultData;
@@ -64,7 +64,7 @@ export class IssueReporterModel {
 Issue Type: <b>${this.getIssueTypeTitle()}</b>
 
 ${this._data.issueDescription}
-
+${this.getExtensionVersion()}
 VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
 OS version: ${this._data.versionInfo && this._data.versionInfo.os}
 
@@ -72,6 +72,14 @@ ${this.getInfos()}
 <!-- generated by issue reporter -->`;
 	}
 
+	private getExtensionVersion(): string {
+		if (this._data.fileOnExtension) {
+			return `\nExtension version: ${this._data.selectedExtension.manifest.version}`;
+		} else {
+			return '';
+		}
+	}
+
 	private getIssueTypeTitle(): string {
 		if (this._data.issueType === IssueType.Bug) {
 			return 'Bug';
@@ -108,8 +116,6 @@ ${this.getInfos()}
 			if (this._data.includeExtensions) {
 				info += this.generateExtensionsMd();
 			}
-
-			info += this._data.reprosWithoutExtensions ? '\nReproduces without extensions' : '\nReproduces only with extensions';
 		}
 
 		if (this._data.issueType === IssueType.SettingsSearchIssue) {
diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
index abf3c7b4ad6..045a35fb717 100644
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -27,6 +27,25 @@ export default (): string => `
 				<!-- To be dynamically filled -->
 			</small>
 		</div>
+
+		<div class="input-group" id="problem-source">
+			<label class="inline-label" for="issue-source">${escape(localize('issueSourceLabel', "File on"))}</label>
+			<select id="issue-source" class="inline-form-control">
+				<option value="false">${escape(localize('vscode', "Visual Studio Code"))}</option>
+				<option value="true">${escape(localize('extension', "An Extension"))}</option>
+			</select>
+			<div class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."))
+		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
+			</div>
+
+			<div id="extension-selection">
+				<label class="inline-label" for="extension-selector">${escape(localize('chooseExtension', "Extension"))} <span class="required-input">*</span></label>
+				<select id="extension-selector" class="inline-form-control">
+					<!-- To be dynamically filled -->
+				</select>
+			</div>
+		</div>
+
 	</div>
 
 	<div class="system-info" id="block-container">
@@ -112,28 +131,6 @@ export default (): string => `
 		</div>
 	</div>
 
-	<div class="section" id="disabledExtensions">
-		<div class="extensions-form">
-			<label>${escape(localize('tryDisablingExtensions', "Is the problem reproducible when extensions are disabled?"))}</label>
-			<div class="form-buttons">
-				<div class="choice">
-					<input type="radio" id="reproducesWithoutExtensions" value=true name="reprosWithoutExtensions" />
-					<label for="reproducesWithoutExtensions">${escape(localize('yes', "Yes"))}</label>
-				</div>
-				<div class="choice">
-					<input type="radio" id="reproducesWithExtensions" value=false name="reprosWithoutExtensions" checked/>
-					<label for="reproducesWithExtensions">${escape(localize('no', "No"))}</label>
-				</div>
-			</div>
-		</div>
-		<div class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}."))
-		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
-		</div>
-		<div class="instructions">${escape(localize('showRunningExtensionsLabelText', "If you suspect it's an extension issue, {0} to report the issue on the extension."))
-		.replace('{0}', `<span tabIndex=0 role="button"id="showRunning" class="workbenchCommand">${escape(localize('showRunningExtensions', "view all running extensions"))}</span>`)}
-		</div>
-	</div>
-
 	<div class="input-group description-section">
 		<label for="description" id="issue-description-label">
 			<!-- To be dynamically filled -->
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index 0b1cc2300a4..486ab705a5a 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -18,16 +18,11 @@ th {
 	vertical-align: bottom;
 	border-bottom: 2px solid #e9ecef;
 	padding: .75rem;
-	border-top: 1px solid #e9ecef;
 	text-align: inherit;
 }
-tr:nth-of-type(even) {
-	background-color: rgba(0,0,0,.05);
-}
 td {
 	padding: .75rem;
 	vertical-align: top;
-	border-top: 1px solid #e9ecef;
 }
 
 .block-settingsSearchResults-details {
@@ -39,7 +34,7 @@ td {
 }
 
 .section {
-	margin-bottom: 1.5em;
+	margin-bottom: .5em;
 }
 
 /**
@@ -185,24 +180,8 @@ textarea {
 	margin-bottom: 1em;
 }
 
-.extensions-form {
-	display: flex;
-}
-
-.extensions-form > .form-buttons {
-	display: flex;
-	margin-left: 20px;
-}
-
-.extensions-form > .form-buttons > .choice {
-	display: flex;
-	align-items: center;
-	margin-right: 20px;
-}
-
-.extensions-form > .form-buttons > .choice > label, .extensions-form  > .form-buttons > .choice > input {
-	cursor: pointer;
-	margin-top: 0;
+#extension-selection {
+	margin-top: 1em;
 }
 
 .system-info {
@@ -323,17 +302,17 @@ button {
 }
 
 #similar-issues {
-	margin-left: 12%;
+	margin-left: 13%;
 	display: block;
 }
 
 @media (max-width: 950px) {
 	.section .inline-label {
-		width: 12%;
+		width: 13%;
 	}
 
 	.section .inline-form-control  {
-		width: calc(88% - 5px);
+		width: calc(87% - 5px);
 	}
 }
 
@@ -342,7 +321,7 @@ button {
 		display: none !important;
 	}
 
-	.inline-form-control {
+	.section .inline-form-control {
 		width: 100%;
 	}
 
diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
index e7ef3aefc59..24cc0c7731e 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -18,8 +18,7 @@ suite('IssueReporter', () => {
 			includeProcessInfo: true,
 			includeExtensions: true,
 			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
-			reprosWithoutExtensions: false
+			includeSettingsSearchDetails: true
 		});
 	});
 
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 128b7f6bca1..82d0cc35551 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -117,6 +117,9 @@ export interface IExtensionManifest {
 	activationEvents?: string[];
 	extensionDependencies?: string[];
 	contributes?: IExtensionContributions;
+	repository?: {
+		url: string;
+	};
 }
 
 export interface IGalleryExtensionProperties {

From 8d679fc61673bf10de664b1186f40573242b28ce Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 26 Mar 2018 21:01:49 +0200
Subject: [PATCH 013/383] explorerDecorationProvider also react on added roots

---
 .../files/electron-browser/views/explorerDecorationsProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
index c5ed9e10afd..dcbb387a155 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
@@ -22,7 +22,7 @@ export class ExplorerDecorationsProvider implements IDecorationsProvider {
 		@IWorkspaceContextService contextService: IWorkspaceContextService
 	) {
 		contextService.onDidChangeWorkspaceFolders(e => {
-			this._onDidChange.fire(e.changed.map(wf => wf.uri));
+			this._onDidChange.fire(e.changed.concat(e.added).map(wf => wf.uri));
 		});
 	}
 

From e64b9b4f41e3b17346917894817a7baaa7f1908e Mon Sep 17 00:00:00 2001
From: Andreas Offenhaeuser <anoff@users.noreply.github.com>
Date: Mon, 26 Mar 2018 21:23:27 +0200
Subject: [PATCH 014/383] add AllowInsecureLocalContent option to
 MarkdownPreviewSecurityLevel (#46473)

---
 .../src/features/previewContentProvider.ts                | 3 +++
 extensions/markdown-language-features/src/security.ts     | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/extensions/markdown-language-features/src/features/previewContentProvider.ts b/extensions/markdown-language-features/src/features/previewContentProvider.ts
index 7652d5aa3cb..e2cbae775bf 100644
--- a/extensions/markdown-language-features/src/features/previewContentProvider.ts
+++ b/extensions/markdown-language-features/src/features/previewContentProvider.ts
@@ -164,6 +164,9 @@ export class MarkdownContentProvider {
 			case MarkdownPreviewSecurityLevel.AllowInsecureContent:
 				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: http: https: data:; media-src vscode-resource: http: https: data:; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' http: https: data:; font-src vscode-resource: http: https: data:;">`;
 
+			case MarkdownPreviewSecurityLevel.AllowInsecureLocalContent:
+				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; media-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' https: data: http://localhost:* http://127.0.0.1:*; font-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*;">`;
+
 			case MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent:
 				return '';
 
diff --git a/extensions/markdown-language-features/src/security.ts b/extensions/markdown-language-features/src/security.ts
index ef04896bec3..a09ce1f538a 100644
--- a/extensions/markdown-language-features/src/security.ts
+++ b/extensions/markdown-language-features/src/security.ts
@@ -14,7 +14,8 @@ const localize = nls.loadMessageBundle();
 export enum MarkdownPreviewSecurityLevel {
 	Strict = 0,
 	AllowInsecureContent = 1,
-	AllowScriptsAndAllContent = 2
+	AllowScriptsAndAllContent = 2,
+	AllowInsecureLocalContent = 3
 }
 
 export interface ContentSecurityPolicyArbiter {
@@ -109,6 +110,10 @@ export class PreviewSecuritySelector {
 					type: MarkdownPreviewSecurityLevel.Strict,
 					label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.Strict) + localize('strict.title', 'Strict'),
 					description: localize('strict.description', 'Only load secure content'),
+				}, {
+					type: MarkdownPreviewSecurityLevel.AllowInsecureLocalContent,
+					label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowInsecureLocalContent) + localize('insecureLocalContent.title', 'Allow insecure local content'),
+					description: localize('insecureLocalContent.description', 'Enable loading content over http served from localhost'),
 				}, {
 					type: MarkdownPreviewSecurityLevel.AllowInsecureContent,
 					label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowInsecureContent) + localize('insecureContent.title', 'Allow insecure content'),
@@ -133,7 +138,6 @@ export class PreviewSecuritySelector {
 					'preview.showPreviewSecuritySelector.title',
 					'Select security settings for Markdown previews in this workspace'),
 			});
-
 		if (!selection) {
 			return;
 		}

From 6e48ccc9e8963184863912099bf2de5c7fdba74a Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 26 Mar 2018 21:23:43 +0200
Subject: [PATCH 015/383] Prefer length comparison

---
 src/vs/editor/common/services/languagesRegistry.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts
index a99127c1536..13225e51b8c 100644
--- a/src/vs/editor/common/services/languagesRegistry.ts
+++ b/src/vs/editor/common/services/languagesRegistry.ts
@@ -111,7 +111,7 @@ export class LanguagesRegistry {
 
 		let primaryMime: string = null;
 
-		if (Array.isArray(lang.mimetypes) && lang.mimetypes.length) {
+		if (Array.isArray(lang.mimetypes) && lang.mimetypes.length > 0) {
 			resolvedLanguage.mimetypes.push(...lang.mimetypes);
 			primaryMime = lang.mimetypes[0];
 		}

From e65578ef34d6517ba8eb0a0561422d17135f2c5c Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 26 Mar 2018 21:50:04 +0200
Subject: [PATCH 016/383] breakpoint widget: hook up completion items

---
 .../debug/browser/media/breakpointWidget.css  |  1 +
 .../electron-browser/breakpointWidget.ts      | 43 +++++++++++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css b/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
index 2efc6078cf7..165dd70d690 100644
--- a/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
+++ b/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
@@ -14,6 +14,7 @@
 	justify-content: center;
 	flex-direction: column;
 	padding: 0 10px;
+	flex-shrink: 0;
 }
 
 .monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputContainer {
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index 6d0c31bb732..c65101038c1 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -10,6 +10,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import * as dom from 'vs/base/browser/dom';
+import { Position } from 'vs/editor/common/core/position';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
@@ -24,6 +25,12 @@ import { ServicesAccessor, EditorCommand, registerEditorCommand } from 'vs/edito
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import uri from 'vs/base/common/uri';
+import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { ITextModel } from 'vs/editor/common/model';
+import { wireCancellationToken } from 'vs/base/common/async';
+import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
+import { TPromise } from 'vs/base/common/winjs.base';
 
 const $ = dom.$;
 const IPrivateBreakopintWidgetService = createDecorator<IPrivateBreakopintWidgetService>('privateBreakopintWidgetService');
@@ -139,11 +146,10 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 
 		this.input.getModel().setValue(this.getInputValue(this.breakpoint));
 		// Due to an electron bug we have to do the timeout, otherwise we do not get focus
-		setTimeout(() => this.input.focus(), 50);
+		setTimeout(() => this.input.focus(), 70);
 	}
 
 	public close(success: boolean): void {
-		// TODO@isidor check if we should check the disposed check
 		if (success) {
 			// if there is already a breakpoint on this location - remove it.
 
@@ -187,7 +193,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 	}
 
 	protected _doLayout(heightInPixel: number, widthInPixel: number): void {
-		this.input.layout({ height: 18, width: widthInPixel - 133 });
+		this.input.layout({ height: 18, width: widthInPixel - 113 });
 	}
 
 	private createBreakpointInput(container: HTMLElement): void {
@@ -202,6 +208,37 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:breakpointinput`), true);
 		this.input.setModel(model);
 		this.toDispose.push(model);
+
+		SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
+			triggerCharacters: ['.'],
+			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
+				let suggestions: TPromise<ISuggestResult>;
+				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
+					suggestions = provideSuggestionItems(this.editor.getModel(), this.editor.getPosition(), 'none').then(suggestions => {
+						return { suggestions: suggestions.map(s => s.suggestion) };
+					});
+				} else {
+					suggestions = TPromise.as({ suggestions: [] });
+				}
+
+				return wireCancellationToken(token, suggestions);
+			}
+		});
+	}
+
+	private isCurlyBracketOpen(): boolean {
+		const value = this.input.getModel().getValue();
+		for (let i = this.input.getPosition().column - 2; i >= 0; i--) {
+			if (value[i] === '{') {
+				return true;
+			}
+
+			if (value[i] === '}') {
+				return false;
+			}
+		}
+
+		return false;
 	}
 
 	public dispose(): void {

From 6e35d9c929342e8f14098e1653f9c62bb9a0d02d Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 26 Mar 2018 21:51:01 +0200
Subject: [PATCH 017/383] Avoid string allocation

---
 .../contrib/comment/blockCommentCommand.ts    | 19 +++++++++++++++----
 .../comment/test/lineCommentCommand.test.ts   | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/comment/blockCommentCommand.ts b/src/vs/editor/contrib/comment/blockCommentCommand.ts
index d6ceea7e08d..a2e51740ebd 100644
--- a/src/vs/editor/contrib/comment/blockCommentCommand.ts
+++ b/src/vs/editor/contrib/comment/blockCommentCommand.ts
@@ -33,12 +33,23 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 			return false;
 		}
 
-		const haystackUpper = haystack.toUpperCase();
-		const needleUpper = needle.toUpperCase();
 		for (let i = 0; i < needleLength; i++) {
-			if (haystackUpper.charCodeAt(offset + i) !== needleUpper.charCodeAt(i)) {
-				return false;
+			const codeA = haystack.charCodeAt(offset + i);
+			const codeB = needle.charCodeAt(i);
+
+			if (codeA === codeB) {
+				continue;
 			}
+			if (codeA >= CharCode.A && codeA <= CharCode.Z && codeA + 32 === codeB) {
+				// codeA is upper-case variant of codeB
+				continue;
+			}
+			if (codeB >= CharCode.A && codeB <= CharCode.Z && codeB + 32 === codeA) {
+				// codeB is upper-case variant of codeA
+				continue;
+			}
+
+			return false;
 		}
 		return true;
 	}
diff --git a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
index e1e61fa2262..57cd4ccde56 100644
--- a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
@@ -45,6 +45,25 @@ suite('Editor Contrib - Line Comment Command', () => {
 		);
 	});
 
+	test('case insensitive', function () {
+		function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
+			let mode = new CommentMode({ lineComment: 'rem' });
+			testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle), expectedLines, expectedSelection);
+			mode.dispose();
+		}
+
+		testLineCommentCommand(
+			[
+				'REM some text'
+			],
+			new Selection(1, 1, 1, 1),
+			[
+				'some text'
+			],
+			new Selection(1, 1, 1, 1)
+		);
+	});
+
 	function createSimpleModel(lines: string[]): ISimpleModel {
 		return {
 			getLineContent: (lineNumber: number) => {

From c1a493536e927086f76df02d87a93b8ede481511 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 26 Mar 2018 22:16:37 +0200
Subject: [PATCH 018/383] breakpoint widget: bring back placeholder text as
 decorations

---
 .../electron-browser/breakpointWidget.ts      | 67 ++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index c65101038c1..a914f3a7521 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -31,6 +31,9 @@ import { ITextModel } from 'vs/editor/common/model';
 import { wireCancellationToken } from 'vs/base/common/async';
 import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { IDecorationOptions } from '../../../../editor/common/editorCommon';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 
 const $ = dom.$;
 const IPrivateBreakopintWidgetService = createDecorator<IPrivateBreakopintWidgetService>('privateBreakopintWidgetService');
@@ -38,6 +41,7 @@ export interface IPrivateBreakopintWidgetService {
 	_serviceBrand: any;
 	close(success: boolean): void;
 }
+const DECORATION_KEY = 'breakpointwidgetdecoration';
 
 export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWidgetService {
 	public _serviceBrand: any;
@@ -56,7 +60,8 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 		@IThemeService private themeService: IThemeService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IModelService private modelService: IModelService
+		@IModelService private modelService: IModelService,
+		@ICodeEditorService private codeEditorService: ICodeEditorService,
 	) {
 		super(editor, { showFrame: true, showArrow: false, frameWidth: 1 });
 
@@ -79,30 +84,21 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 				this.dispose();
 			}
 		}));
+		this.codeEditorService.registerDecorationType(DECORATION_KEY, {});
+
 		this.create();
 	}
 
-	// private get placeholder(): string {
-	// 	switch (this.context) {
-	// 		case Context.LOG_MESSAGE:
-	// 			return nls.localize('breakpointWidgetLogMessagePlaceholder', "Message to log when breakpoint is hit. Expressions within {} are interpolated. 'Enter' to accept, 'esc' to cancel.");
-	// 		case Context.HIT_COUNT:
-	// 			return nls.localize('breakpointWidgetHitCountPlaceholder', "Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.");
-	// 		default:
-	// 			return nls.localize('breakpointWidgetExpressionPlaceholder', "Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.");
-	// 	}
-	// }
-
-	// private get ariaLabel(): string {
-	// 	switch (this.context) {
-	// 		case Context.LOG_MESSAGE:
-	// 			return nls.localize('breakpointWidgetLogMessageAriaLabel', "The program will log this message everytime this breakpoint is hit. Press Enter to accept or Escape to cancel.");
-	// 		case Context.HIT_COUNT:
-	// 			return nls.localize('breakpointWidgetHitCountAriaLabel', "The program will only stop here if the hit count is met. Press Enter to accept or Escape to cancel.");
-	// 		default:
-	// 			return nls.localize('breakpointWidgetAriaLabel', "The program will only stop here if this condition is true. Press Enter to accept or Escape to cancel.");
-	// 	}
-	// }
+	private get placeholder(): string {
+		switch (this.context) {
+			case Context.LOG_MESSAGE:
+				return nls.localize('breakpointWidgetLogMessagePlaceholder', "Message to log when breakpoint is hit. Expressions within {} are interpolated. 'Enter' to accept, 'esc' to cancel.");
+			case Context.HIT_COUNT:
+				return nls.localize('breakpointWidgetHitCountPlaceholder', "Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.");
+			default:
+				return nls.localize('breakpointWidgetExpressionPlaceholder', "Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.");
+		}
+	}
 
 	private getInputValue(breakpoint: IBreakpoint): string {
 		switch (this.context) {
@@ -139,7 +135,8 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 			this.rememberInput();
 			this.context = e.index;
 
-			this.input.getModel().setValue(this.getInputValue(this.breakpoint));
+			const value = this.getInputValue(this.breakpoint);
+			this.input.getModel().setValue(value);
 		});
 
 		this.createBreakpointInput(dom.append(container, $('.inputContainer')));
@@ -208,6 +205,13 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:breakpointinput`), true);
 		this.input.setModel(model);
 		this.toDispose.push(model);
+		const setDecorations = () => {
+			const value = this.input.getModel().getValue();
+			const decorations = !!value ? [] : this.createDecorations();
+			this.input.setDecorations(DECORATION_KEY, decorations);
+		};
+		this.input.getModel().onDidChangeContent(() => setDecorations());
+		this.themeService.onThemeChange(() => setDecorations());
 
 		SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
 			triggerCharacters: ['.'],
@@ -226,6 +230,23 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 		});
 	}
 
+	private createDecorations(): IDecorationOptions[] {
+		return [{
+			range: {
+				startLineNumber: 0,
+				endLineNumber: 0,
+				startColumn: 0,
+				endColumn: 1
+			},
+			renderOptions: {
+				after: {
+					contentText: this.placeholder,
+					color: transparent(editorForeground, 0.4)(this.themeService.getTheme()).toString()
+				}
+			}
+		}];
+	}
+
 	private isCurlyBracketOpen(): boolean {
 		const value = this.input.getModel().getValue();
 		for (let i = this.input.getPosition().column - 2; i >= 0; i--) {

From 89bf5a62d7d2be5993d886ca690a64a3a23f3946 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 26 Mar 2018 13:29:09 -0700
Subject: [PATCH 019/383] Fix terminal panel resize

Fixes #46577
---
 .../terminal/electron-browser/terminalTab.ts  | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
index aaf35637304..55eb0c497b3 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
@@ -149,22 +149,16 @@ class SplitPaneContainer {
 	}
 
 	public layout(width: number, height: number): void {
-		const resizeCallback = () => {
-			this._width = width;
-			this._height = height;
-			if (this.orientation === Orientation.HORIZONTAL) {
-				this._children.forEach(c => c.orthogonalLayout(height));
-				this._splitView.layout(width);
-			} else {
-				this._children.forEach(c => c.orthogonalLayout(width));
-				this._splitView.layout(height);
-			}
-		};
-
-		if (this._isManuallySized) {
-			resizeCallback();
+		this._width = width;
+		this._height = height;
+		if (this.orientation === Orientation.HORIZONTAL) {
+			this._children.forEach(c => c.orthogonalLayout(height));
+			this._splitView.layout(width);
 		} else {
-			this._withDisabledLayout(resizeCallback);
+			this._children.forEach(c => c.orthogonalLayout(width));
+			this._splitView.layout(height);
+		}
+		if (!this._isManuallySized) {
 			this.resetSize();
 		}
 	}

From 4d69cb194b232bef33185da7e9ea164f813f4e49 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 26 Mar 2018 22:29:42 +0200
Subject: [PATCH 020/383] breakpoint widget: do not propose for log messages
 outside of {} and for hit count

---
 .../parts/debug/electron-browser/breakpointWidget.ts          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index a914f3a7521..ffc085c466e 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -25,7 +25,7 @@ import { ServicesAccessor, EditorCommand, registerEditorCommand } from 'vs/edito
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import uri from 'vs/base/common/uri';
-import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
+import { SuggestRegistry, ISuggestResult, SuggestContext, SuggestTriggerKind } from 'vs/editor/common/modes';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITextModel } from 'vs/editor/common/model';
 import { wireCancellationToken } from 'vs/base/common/async';
@@ -218,7 +218,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
 				let suggestions: TPromise<ISuggestResult>;
 				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
-					suggestions = provideSuggestionItems(this.editor.getModel(), this.editor.getPosition(), 'none').then(suggestions => {
+					suggestions = provideSuggestionItems(this.editor.getModel(), this.editor.getPosition(), 'none', undefined, { triggerKind: SuggestTriggerKind.Invoke }).then(suggestions => {
 						return { suggestions: suggestions.map(s => s.suggestion) };
 					});
 				} else {

From 7db6419d78ebdad77844919a5c2c0dc109e279fc Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 26 Mar 2018 13:33:05 -0700
Subject: [PATCH 021/383] Avoid re-parsing for emmet completions when triggered
 for incomplete completions

---
 .../emmet/src/defaultCompletionProvider.ts    | 22 ++++++------
 .../emmet/src/test/abbreviationAction.test.ts | 14 ++++----
 .../src/test/cssAbbreviationAction.test.ts    | 36 +++++++++----------
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 29fdcd860b1..458d1fc6d43 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -10,7 +10,7 @@ import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parseDocument,
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 
-	public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Thenable<vscode.CompletionList | undefined> | undefined {
+	public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext): Thenable<vscode.CompletionList | undefined> | undefined {
 		const emmetConfig = vscode.workspace.getConfiguration('emmet');
 		const excludedLanguages = emmetConfig['excludeLanguages'] ? emmetConfig['excludeLanguages'] : [];
 		if (excludedLanguages.indexOf(document.languageId) > -1) {
@@ -33,18 +33,20 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			return;
 		}
 
-		let validateLocation = syntax === 'html';
+		let validateLocation = false;
 		let currentNode: Node | null = null;
 
-		// If document can be css parsed, get currentNode
-		if (isStyleSheet(document.languageId)) {
-			const rootNode = parseDocument(document, false);
-			if (!rootNode) {
-				return;
-			}
+		if (context.triggerKind !== vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) {
+			validateLocation = syntax === 'html' || isStyleSheet(document.languageId);
+			// If document can be css parsed, get currentNode
+			if (isStyleSheet(document.languageId)) {
+				const rootNode = parseDocument(document, false);
+				if (!rootNode) {
+					return;
+				}
 
-			currentNode = getNode(rootNode, position, true);
-			validateLocation = true;
+				currentNode = getNode(rootNode, position, true);
+			}
 		}
 
 		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, currentNode, syntax, position, extractAbbreviationResults.abbreviationRange)) {
diff --git a/extensions/emmet/src/test/abbreviationAction.test.ts b/extensions/emmet/src/test/abbreviationAction.test.ts
index 4f914717061..cf4ba401a23 100644
--- a/extensions/emmet/src/test/abbreviationAction.test.ts
+++ b/extensions/emmet/src/test/abbreviationAction.test.ts
@@ -5,7 +5,7 @@
 
 import 'mocha';
 import * as assert from 'assert';
-import { Selection, workspace, CompletionList, CancellationTokenSource } from 'vscode';
+import { Selection, workspace, CompletionList, CancellationTokenSource, CompletionTriggerKind } from 'vscode';
 import { withRandomFileEditor, closeAllEditors } from './testUtils';
 import { expandEmmetAbbreviation } from '../abbreviationActions';
 import { DefaultCompletionItemProvider } from '../defaultCompletionProvider';
@@ -63,7 +63,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor('img', 'html', (editor, doc) => {
 			editor.selection = new Selection(0, 3, 0, 3);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (!completionPromise) {
 				assert.equal(!completionPromise, false, `Got unexpected undefined instead of a completion promise`);
 				return Promise.resolve();
@@ -165,7 +165,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 			editor.selection = new Selection(2, 4, 2, 4);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
 			return Promise.resolve();
 		});
@@ -185,7 +185,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 			editor.selection = new Selection(9, 8, 9, 8);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
 			return Promise.resolve();
 		});
@@ -207,7 +207,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor(fileContents, 'html', (editor, doc) => {
 			editor.selection = new Selection(0, 6, 0, 6);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
 			return Promise.resolve();
 		});
@@ -234,7 +234,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 	// 	return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 	// 		editor.selection = new Selection(13, 3, 13, 6);
 	// 		const cancelSrc = new CancellationTokenSource();
-	// 		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+	// 		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 	// 		if (!completionPromise) {
 	// 			assert.equal(1, 2, `Problem with expanding m10`);
 	// 			return Promise.resolve();
@@ -347,7 +347,7 @@ function testHtmlCompletionProvider(selection: Selection, abbreviation: string,
 	return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 		editor.selection = selection;
 		const cancelSrc = new CancellationTokenSource();
-		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 		if (!completionPromise) {
 			if (!shouldFail) {
 				assert.equal(1, 2, `Problem with expanding ${abbreviation} to ${expandedText}`);
diff --git a/extensions/emmet/src/test/cssAbbreviationAction.test.ts b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
index 9d53d8599f1..d80a5d31dd0 100644
--- a/extensions/emmet/src/test/cssAbbreviationAction.test.ts
+++ b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
@@ -5,7 +5,7 @@
 
 import 'mocha';
 import * as assert from 'assert';
-import { Selection, CompletionList, CancellationTokenSource, Position } from 'vscode';
+import { Selection, CompletionList, CancellationTokenSource, Position, CompletionTriggerKind } from 'vscode';
 import { withRandomFileEditor, closeAllEditors } from './testUtils';
 import { expandEmmetAbbreviation } from '../abbreviationActions';
 import { DefaultCompletionItemProvider } from '../defaultCompletionProvider';
@@ -79,7 +79,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -101,7 +101,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -118,7 +118,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(0, 30), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(0, 30), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -140,7 +140,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent.replace('#12', '#121212'));
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (!completionPromise) {
 					assert.fail('Completion promise wasnt returned');
 					return Promise.resolve();
@@ -170,7 +170,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -192,7 +192,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent.replace('#12', '#121212'));
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 12), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 12), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (!completionPromise) {
 					assert.fail('Completion promise wasnt returned');
 					return Promise.resolve();
@@ -221,7 +221,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -242,7 +242,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent.replace('#12', '#121212'));
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (!completionPromise) {
 					assert.fail('Completion promise wasnt returned');
 					return Promise.resolve();
@@ -266,8 +266,8 @@ nav#
 		return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
 			editor.selection = new Selection(3, 1, 3, 6);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 6), cancelSrc.token);
-			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 6), cancelSrc.token);
+			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 6), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 6), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (!completionPromise1 || !completionPromise2) {
 				assert.equal(1, 2, `Problem with expanding pos:f`);
 				return Promise.resolve();
@@ -312,10 +312,10 @@ nav#
 		return withRandomFileEditor(scssContents, 'scss', (editor, doc) => {
 			editor.selection = new Selection(3, 4, 3, 4);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 4), cancelSrc.token);
-			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 5), cancelSrc.token);
-			const completionPromise3 = completionProvider.provideCompletionItems(editor.document, new Position(11, 4), cancelSrc.token);
-			const completionPromise4 = completionProvider.provideCompletionItems(editor.document, new Position(14, 5), cancelSrc.token);
+			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 4), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 5), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise3 = completionProvider.provideCompletionItems(editor.document, new Position(11, 4), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise4 = completionProvider.provideCompletionItems(editor.document, new Position(14, 5), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (!completionPromise1) {
 				assert.equal(1, 2, `Problem with expanding padding abbreviations at line 3 col 4`);
 			}
@@ -392,13 +392,13 @@ m10
 		return withRandomFileEditor(scssContentsNoExpand, 'scss', (editor, doc) => {
 			editor.selection = new Selection(1, 3, 1, 3); // outside rule
 			const cancelSrc = new CancellationTokenSource();
-			let completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			let completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (completionPromise) {
 				assert.equal(1, 2, `m10 gets expanded in invalid location (outside rule)`);
 			}
 
 			editor.selection = new Selection(5, 15, 5, 15); // in the value part of property value
-			completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (completionPromise) {
 				return completionPromise.then((completionList: CompletionList) => {
 					if (completionList && completionList.items && completionList.items.length > 0) {
@@ -419,7 +419,7 @@ m10
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), scssContents);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(19, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(19, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}

From cb16bf93080e1651edeec6bfee405a030b8d3776 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 26 Mar 2018 13:41:16 -0700
Subject: [PATCH 022/383] Turn syntax based folding on by default for TS 2.8

---
 extensions/typescript-language-features/package.json            | 2 +-
 extensions/typescript-language-features/src/languageProvider.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 1f6d72c3a9a..30c59877aeb 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -411,7 +411,7 @@
         },
         "typescript.experimental.syntaxFolding": {
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "%typescript.experimental.syntaxFolding%"
         }
       }
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index 193fb0ce9c0..cc7373b15ae 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -150,7 +150,7 @@ export default class LanguageProvider {
 
 	private async initFoldingProvider(): Promise<void> {
 		let enable = workspace.getConfiguration().get(foldingSetting, false);
-		if (enable) {
+		if (enable && this.client.apiVersion.has280Features()) {
 			if (!this.foldingProviderRegistration) {
 				this.foldingProviderRegistration = languages.registerFoldingProvider(this.documentSelector, new (await import('./features/folderingProvider')).default(this.client));
 			}

From 4ba0ecc3d54609cb6c6d10e3301a1e3b68119255 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 26 Mar 2018 22:41:50 +0200
Subject: [PATCH 023/383] breakpoint widget: make sure to dispose completion
 item provider

---
 .../parts/debug/electron-browser/breakpointWidget.ts      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index ffc085c466e..ec17c5f717c 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -20,7 +20,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { SimpleDebugEditor } from 'vs/workbench/parts/debug/electron-browser/simpleDebugEditor';
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection';
 import { ServicesAccessor, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -31,9 +30,10 @@ import { ITextModel } from 'vs/editor/common/model';
 import { wireCancellationToken } from 'vs/base/common/async';
 import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IDecorationOptions } from '../../../../editor/common/editorCommon';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IDecorationOptions } from 'vs/editor/common/editorCommon';
 
 const $ = dom.$;
 const IPrivateBreakopintWidgetService = createDecorator<IPrivateBreakopintWidgetService>('privateBreakopintWidgetService');
@@ -213,7 +213,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 		this.input.getModel().onDidChangeContent(() => setDecorations());
 		this.themeService.onThemeChange(() => setDecorations());
 
-		SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
+		this.toDispose.push(SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
 			triggerCharacters: ['.'],
 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
 				let suggestions: TPromise<ISuggestResult>;
@@ -227,7 +227,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 
 				return wireCancellationToken(token, suggestions);
 			}
-		});
+		}));
 	}
 
 	private createDecorations(): IDecorationOptions[] {

From 71263ed44a717c02ff8e082ec4596a4ce09d4afc Mon Sep 17 00:00:00 2001
From: Aleksey Glazkov <alexglazkov9703@gmail.com>
Date: Mon, 26 Mar 2018 16:45:34 -0400
Subject: [PATCH 024/383] path changed to fsPath

---
 .../parts/execution/electron-browser/execution.contribution.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
index 8f4c9ff89bd..5c9ce1a497f 100644
--- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
@@ -119,7 +119,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			terminalService.openTerminal(root.fsPath);
 		} else {
 			//Opens current file's folder, if no folder is open in editor
-			const path = historyService.getLastActiveFile().path;
+			const path = historyService.getLastActiveFile().fsPath;
 			terminalService.openTerminal(paths.dirname(path));
 		}
 	}

From ea1e57b3ab11148d8463d943658184c15f2c0cb4 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 19 Mar 2018 12:58:39 +0100
Subject: [PATCH 025/383] Multi-select list (#45589)

---
 src/vs/platform/quickOpen/common/quickOpen.ts |   3 +
 .../platform/quickinput/common/quickInput.ts  |  19 ++
 src/vs/vscode.d.ts                            |  12 +
 .../electron-browser/mainThreadQuickOpen.ts   |  29 ++-
 src/vs/workbench/api/node/extHost.api.impl.ts |   2 +-
 src/vs/workbench/api/node/extHost.protocol.ts |   2 +-
 src/vs/workbench/api/node/extHostQuickOpen.ts |  17 +-
 src/vs/workbench/browser/layout.ts            |   7 +
 .../browser/parts/quickinput/quickInput.css   |  28 +++
 .../browser/parts/quickinput/quickInput.ts    | 217 ++++++++++++++++++
 .../workbench/electron-browser/workbench.ts   |   9 +
 11 files changed, 331 insertions(+), 14 deletions(-)
 create mode 100644 src/vs/platform/quickinput/common/quickInput.ts
 create mode 100644 src/vs/workbench/browser/parts/quickinput/quickInput.css
 create mode 100644 src/vs/workbench/browser/parts/quickinput/quickInput.ts

diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index 24975fa0e09..a6a169303b9 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -33,6 +33,7 @@ export interface IPickOpenEntry {
 	run?: (context: IEntryRunContext) => void;
 	action?: IAction;
 	payload?: any;
+	selected?: boolean;
 }
 
 export interface IPickOpenItem {
@@ -84,6 +85,8 @@ export interface IPickOptions {
 	 * a context key to set when this picker is active
 	 */
 	contextKey?: string;
+
+	multiSelect?: boolean;
 }
 
 export interface IInputOptions {
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
new file mode 100644
index 00000000000..c5e05dc6cd4
--- /dev/null
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IPickOptions, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+export const IQuickInputService = createDecorator<IQuickInputService>('quickInputService');
+
+export interface IQuickInputService {
+
+	_serviceBrand: any;
+
+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]>;
+}
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 070409e485b..0db6fc8d414 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1554,12 +1554,22 @@ declare module 'vscode' {
 		 */
 		ignoreFocusOut?: boolean;
 
+		multiSelect?: boolean;
+
 		/**
 		 * An optional function that is invoked whenever an item is selected.
 		 */
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}
 
+	export interface MultiSelectQuickPickItem extends QuickPickItem {
+		selected?: boolean;
+	}
+
+	export interface MultiSelectQuickPickOptions extends QuickPickOptions {
+		multiSelect: true;
+	}
+
 	/**
 	 * Options to configure the behaviour of the [workspace folder](#WorkspaceFolder) pick UI.
 	 */
@@ -5069,6 +5079,7 @@ declare module 'vscode' {
 		 * @param token A token that can be used to signal cancellation.
 		 * @return A promise that resolves to the selection or `undefined`.
 		 */
+		export function showQuickPick(items: string[] | Thenable<string[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<string[] | undefined>;
 		export function showQuickPick(items: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 
 		/**
@@ -5079,6 +5090,7 @@ declare module 'vscode' {
 		 * @param token A token that can be used to signal cancellation.
 		 * @return A promise that resolves to the selected item or `undefined`.
 		 */
+		export function showQuickPick<T extends MultiSelectQuickPickItem>(items: T[] | Thenable<T[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<T[] | undefined>;
 		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
 
 		/**
diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index 7ac56ff2c63..959efeff31d 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -7,6 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { IQuickOpenService, IPickOptions, IInputOptions } from 'vs/platform/quickOpen/common/quickOpen';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { InputBoxOptions } from 'vscode';
 import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
@@ -23,7 +24,8 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IQuickOpenService quickOpenService: IQuickOpenService
+		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IQuickInputService private _quickInputService: IQuickInputService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostQuickOpen);
 		this._quickOpenService = quickOpenService;
@@ -32,7 +34,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	public dispose(): void {
 	}
 
-	$show(options: IPickOptions): TPromise<number> {
+	$show(options: IPickOptions): TPromise<number | number[]> {
 
 		const myToken = ++this._token;
 
@@ -50,12 +52,25 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			};
 		});
 
-		return asWinJsPromise(token => this._quickOpenService.pick(this._contents, options, token)).then(item => {
-			if (item) {
-				return item.handle;
+		return asWinJsPromise<number | number[]>(token => {
+			if (options.multiSelect) {
+				return this._quickInputService.pick(this._contents, options, token)
+					.then(items => {
+						if (items) {
+							return items.map(item => item.handle);
+						}
+						return undefined;
+					});
+			} else {
+				return this._quickOpenService.pick(this._contents, options, token)
+					.then(item => {
+						if (item) {
+							return item.handle;
+						}
+						return undefined;
+					});
 			}
-			return undefined;
-		}, undefined, progress => {
+		}).then(undefined, undefined, progress => {
 			if (progress) {
 				this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
 			}
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 82fc8af5fea..de10ae5c3cf 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -366,7 +366,7 @@ export function createApiFactory(
 			showErrorMessage(message, first, ...rest) {
 				return extHostMessageService.showMessage(extension, Severity.Error, message, first, rest);
 			},
-			showQuickPick(items: any, options: vscode.QuickPickOptions, token?: vscode.CancellationToken) {
+			showQuickPick(items: any, options: vscode.QuickPickOptions, token?: vscode.CancellationToken): any {
 				return extHostQuickOpen.showQuickPick(items, options, token);
 			},
 			showWorkspaceFolderPick(options: vscode.WorkspaceFolderPickOptions) {
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 8a1b10bc57b..1a1336e3367 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -327,7 +327,7 @@ export interface MyQuickPickItems extends IPickOpenEntry {
 	handle: number;
 }
 export interface MainThreadQuickOpenShape extends IDisposable {
-	$show(options: IPickOptions): TPromise<number>;
+	$show(options: IPickOptions): TPromise<number | number[]>;
 	$setItems(items: MyQuickPickItems[]): TPromise<any>;
 	$setError(error: Error): TPromise<any>;
 	$input(options: vscode.InputBoxOptions, validateInput: boolean): TPromise<string>;
diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts
index 2d32ed719fe..b95da3ae7b2 100644
--- a/src/vs/workbench/api/node/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/node/extHostQuickOpen.ts
@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { wireCancellationToken, asWinJsPromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { QuickPickOptions, QuickPickItem, InputBoxOptions, WorkspaceFolderPickOptions, WorkspaceFolder } from 'vscode';
+import { QuickPickOptions, QuickPickItem, InputBoxOptions, WorkspaceFolderPickOptions, WorkspaceFolder, MultiSelectQuickPickItem, MultiSelectQuickPickOptions } from 'vscode';
 import { MainContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, IMainContext } from './extHost.protocol';
 import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
@@ -29,9 +29,10 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 		this._commands = commands;
 	}
 
+	showQuickPick(itemsOrItemsPromise: MultiSelectQuickPickItem[] | Thenable<MultiSelectQuickPickItem[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<MultiSelectQuickPickItem[] | undefined>;
 	showQuickPick(itemsOrItemsPromise: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<QuickPickItem | undefined>;
-	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | undefined> {
+	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | Item[] | undefined> {
 
 		// clear state from last invocation
 		this._onDidSelectItem = undefined;
@@ -43,7 +44,8 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 			placeHolder: options && options.placeHolder,
 			matchOnDescription: options && options.matchOnDescription,
 			matchOnDetail: options && options.matchOnDetail,
-			ignoreFocusLost: options && options.ignoreFocusOut
+			ignoreFocusLost: options && options.ignoreFocusOut,
+			multiSelect: options && options.multiSelect
 		});
 
 		const promise = TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
@@ -60,6 +62,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 					let label: string;
 					let description: string;
 					let detail: string;
+					let selected: boolean;
 
 					if (typeof item === 'string') {
 						label = item;
@@ -67,12 +70,14 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 						label = item.label;
 						description = item.description;
 						detail = item.detail;
+						selected = options && options.multiSelect ? (<MultiSelectQuickPickItem>item).selected : undefined;
 					}
 					pickItems.push({
 						label,
 						description,
 						handle,
-						detail
+						detail,
+						selected
 					});
 				}
 
@@ -89,6 +94,8 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 				return quickPickWidget.then(handle => {
 					if (typeof handle === 'number') {
 						return items[handle];
+					} else if (Array.isArray(handle)) {
+						return handle.map(h => items[h]);
 					}
 					return undefined;
 				});
@@ -98,7 +105,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 				return TPromise.wrapError(err);
 			});
 		});
-		return wireCancellationToken<Item>(token, promise, true);
+		return wireCancellationToken<Item | Item[]>(token, promise, true);
 	}
 
 	$onItemSelected(handle: number): void {
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 0699347dc75..620b755fefb 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -9,6 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import { Part } from 'vs/workbench/browser/part';
 import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickOpenController';
+import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
 import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IPartService, Position, ILayoutOptions, Parts } from 'vs/workbench/services/part/common/partService';
@@ -67,6 +68,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 	private panel: Part;
 	private statusbar: Part;
 	private quickopen: QuickOpenController;
+	private quickInput: QuickInputService;
 	private notificationsCenter: NotificationsCenter;
 	private notificationsToasts: NotificationsToasts;
 	private toUnbind: IDisposable[];
@@ -97,6 +99,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 			statusbar: Part
 		},
 		quickopen: QuickOpenController,
+		quickInput: QuickInputService,
 		notificationsCenter: NotificationsCenter,
 		notificationsToasts: NotificationsToasts,
 		@IStorageService private storageService: IStorageService,
@@ -116,6 +119,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		this.panel = parts.panel;
 		this.statusbar = parts.statusbar;
 		this.quickopen = quickopen;
+		this.quickInput = quickInput;
 		this.notificationsCenter = notificationsCenter;
 		this.notificationsToasts = notificationsToasts;
 		this.toUnbind = [];
@@ -651,6 +655,9 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		// Quick open
 		this.quickopen.layout(this.workbenchSize);
 
+		// Quick input
+		this.quickInput.layout(this.workbenchSize);
+
 		// Notifications
 		this.notificationsCenter.layout(this.workbenchSize);
 		this.notificationsToasts.layout(this.workbenchSize);
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
new file mode 100644
index 00000000000..b8e411d30cf
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.quick-input-widget {
+	position: absolute;
+	width: 600px;
+	z-index: 2000;
+	padding-bottom: 6px;
+	left: 50%;
+	margin-left: -300px;
+}
+
+.quick-input-actions {
+	padding: 3px;
+}
+
+.quick-input-actions button {
+	border: 0;
+	padding: 0px 4px 1px 4px;
+	float: right;
+	margin-left: 4px;
+}
+
+.quick-input-actions button:focus {
+	outline:0;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
new file mode 100644
index 00000000000..dd1b1817aa2
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./quickInput';
+import { Component } from 'vs/workbench/common/component';
+import { IQuickInputService } from 'vs/platform/quickInput/common/quickInput';
+import { IPartService } from 'vs/workbench/services/part/common/partService';
+import { Dimension } from 'vs/base/browser/builder';
+import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import * as dom from 'vs/base/browser/dom';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
+import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
+import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+const $ = dom.$;
+
+export interface ISelectedElement {
+	item: object;
+	label: string;
+	selected: boolean;
+}
+
+interface ISelectedElementTemplateData {
+	element: HTMLElement;
+	name: HTMLElement;
+	checkbox: HTMLInputElement;
+	context: ISelectedElement;
+	toDispose: IDisposable[];
+}
+
+class SelectedElementRenderer implements IRenderer<ISelectedElement, ISelectedElementTemplateData> {
+
+	static readonly ID = 'selectedelement';
+
+	get templateId() {
+		return SelectedElementRenderer.ID;
+	}
+
+	renderTemplate(container: HTMLElement): ISelectedElementTemplateData {
+		const data: ISelectedElementTemplateData = Object.create(null);
+		data.element = dom.append(container, $('.selected_element'));
+
+		data.checkbox = <HTMLInputElement>$('input');
+		data.checkbox.type = 'checkbox';
+		data.toDispose = [];
+		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => data.context.selected = !data.context.selected));
+
+		dom.append(data.element, data.checkbox);
+
+		data.name = dom.append(data.element, $('span.label'));
+
+		return data;
+	}
+
+	renderElement(element: ISelectedElement, index: number, data: ISelectedElementTemplateData): void {
+		data.context = element;
+		data.name.textContent = element.label;
+		data.element.title = data.name.textContent;
+		data.checkbox.checked = element.selected;
+	}
+
+	disposeTemplate(templateData: ISelectedElementTemplateData): void {
+		dispose(templateData.toDispose);
+	}
+}
+
+class SelectedElementDelegate implements IDelegate<ISelectedElement> {
+
+	getHeight(element: ISelectedElement): number {
+		return 22;
+	}
+
+	getTemplateId(element: ISelectedElement): string {
+		return SelectedElementRenderer.ID;
+	}
+}
+
+export class QuickInputService extends Component implements IQuickInputService {
+
+	public _serviceBrand: any;
+
+	private static readonly ID = 'workbench.component.quickinput';
+	private static readonly MAX_WIDTH = 600;				// Max total width of quick open widget
+	// private static readonly MAX_ITEMS_HEIGHT = 20 * 22;	// Max height of item list below input field
+
+	private layoutDimensions: Dimension;
+	private container: HTMLElement;
+	private list: WorkbenchList<ISelectedElement>;
+
+	private elements: ISelectedElement[] = [];
+	private resolve: (value?: object[] | Thenable<object[]>) => void;
+
+	constructor(
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IPartService private partService: IPartService,
+		@IThemeService themeService: IThemeService
+	) {
+		super(QuickInputService.ID, themeService);
+	}
+
+	private create() {
+		if (this.container) {
+			return;
+		}
+
+		const workbench = document.getElementById(this.partService.getWorkbenchElementId());
+		this.container = dom.append(workbench, $('.quick-input-widget'));
+		this.container.style.display = 'none';
+
+		const listContainer = dom.append(this.container, $('.quick-input-list'));
+		const delegate = new SelectedElementDelegate();
+		this.list = this.instantiationService.createInstance(WorkbenchList, listContainer, delegate, [new SelectedElementRenderer()], {
+			identityProvider: element => element.label,
+			multipleSelectionSupport: false
+		}) as WorkbenchList<ISelectedElement>;
+
+		const buttonContainer = dom.append(this.container, $('.quick-input-actions'));
+		const cancel = dom.append(buttonContainer, $('button'));
+		cancel.textContent = 'Cancel'; // TODO
+		this.toUnbind.push(dom.addDisposableListener(cancel, dom.EventType.CLICK, e => this.close(false)));
+		const ok = dom.append(buttonContainer, $('button'));
+		ok.textContent = 'OK'; // TODO
+		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(true)));
+
+		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
+			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
+				if (element === this.container) {
+					return;
+				}
+			}
+			this.close(false);
+		}));
+	}
+
+	private close(ok: boolean) {
+		if (ok) {
+			this.resolve(this.elements.filter(e => e.selected).map(e => e.item));
+		} else {
+			this.resolve();
+		}
+		this.container.style.display = 'none';
+	}
+
+	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]> {
+		this.create();
+
+		// TODO: Progress indication.
+		this.elements = (await picks).map(item => ({
+			item,
+			label: item.label,
+			selected: !!item.selected
+		}));
+		this.list.splice(0, this.list.length, this.elements);
+
+		this.container.style.display = null;
+		this.updateLayout();
+		this.list.focusFirst();
+		this.list.domFocus();
+
+		return new TPromise<T[]>(resolve => this.resolve = resolve);
+	}
+
+	public layout(dimension: Dimension): void {
+		this.layoutDimensions = dimension;
+		this.updateLayout();
+	}
+
+	private updateLayout() {
+		if (this.layoutDimensions && this.container) {
+			const titlebarOffset = this.partService.getTitleBarOffset();
+			this.container.style.top = `${titlebarOffset}px`;
+
+			const style = this.container.style;
+			const width = Math.min(this.layoutDimensions.width * 0.62 /* golden cut */, QuickInputService.MAX_WIDTH);
+			style.width = width + 'px';
+			style.marginLeft = '-' + (width / 2) + 'px';
+
+			this.list.layout();
+		}
+	}
+}
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const sideBarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
+	const sideBarForeground = theme.getColor(SIDE_BAR_FOREGROUND);
+	const contrastBorderColor = theme.getColor(contrastBorder);
+	const widgetShadowColor = theme.getColor(widgetShadow);
+	collector.addRule(`.quick-input-widget {
+		${sideBarBackground ? `background-color: ${sideBarBackground};` : ''}
+		${sideBarForeground ? `color: ${sideBarForeground};` : ''}
+		${contrastBorderColor ? `border: 1px solid ${contrastBorderColor};` : ''}
+		${widgetShadowColor ? `box-shadow: 0 5px 8px ${widgetShadowColor};` : ''}
+	}`);
+
+	const buttonBackgroundColor = theme.getColor(buttonBackground);
+	const buttonForegroundColor = theme.getColor(buttonForeground);
+	collector.addRule(`.quick-input-actions button {
+		${buttonBackgroundColor ? `background-color: ${buttonBackgroundColor};` : ''}
+		${buttonForegroundColor ? `color: ${buttonForegroundColor};` : ''}
+		${contrastBorderColor ? `border: 1px solid ${contrastBorderColor};` : ''}
+	}`);
+
+	const buttonHoverBackgroundColor = theme.getColor(buttonHoverBackground);
+	if (buttonHoverBackgroundColor) {
+		collector.addRule(`.quick-input-actions button:hover { background-color: ${buttonHoverBackgroundColor}; }`);
+	}
+});
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 88d3f128bba..ba962650df6 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -35,6 +35,8 @@ import { WorkbenchLayout } from 'vs/workbench/browser/layout';
 import { IActionBarRegistry, Extensions as ActionBarExtensions } from 'vs/workbench/browser/actions';
 import { PanelRegistry, Extensions as PanelExtensions } from 'vs/workbench/browser/panel';
 import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickOpenController';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
 import { getServices } from 'vs/platform/instantiation/common/extensions';
 import { Position, Parts, IPartService, ILayoutOptions, Dimension } from 'vs/workbench/services/part/common/partService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -199,6 +201,7 @@ export class Workbench implements IPartService {
 	private editorPart: EditorPart;
 	private statusbarPart: StatusbarPart;
 	private quickOpen: QuickOpenController;
+	private quickInput: QuickInputService;
 	private notificationsCenter: NotificationsCenter;
 	private notificationsToasts: NotificationsToasts;
 	private workbenchLayout: WorkbenchLayout;
@@ -622,6 +625,11 @@ export class Workbench implements IPartService {
 		this.toUnbind.push({ dispose: () => this.quickOpen.shutdown() });
 		serviceCollection.set(IQuickOpenService, this.quickOpen);
 
+		// Quick input service
+		this.quickInput = this.instantiationService.createInstance(QuickInputService);
+		this.toUnbind.push({ dispose: () => this.quickInput.shutdown() });
+		serviceCollection.set(IQuickInputService, this.quickInput);
+
 		// Contributed services
 		const contributedServices = getServices();
 		for (let contributedService of contributedServices) {
@@ -1154,6 +1162,7 @@ export class Workbench implements IPartService {
 				statusbar: this.statusbarPart,			// Statusbar
 			},
 			this.quickOpen,								// Quickopen
+			this.quickInput,							// QuickInput
 			this.notificationsCenter,					// Notifications Center
 			this.notificationsToasts					// Notifications Toasts
 		);

From 7cd879573d399be1ed333625f025d488b9358a70 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 20 Mar 2018 09:57:22 +0100
Subject: [PATCH 026/383] Input box and checkbox list (#45589)

---
 .../browser/parts/quickinput/quickInput.css   |   4 +
 .../browser/parts/quickinput/quickInput.ts    | 103 ++--------
 .../browser/parts/quickinput/quickInputBox.ts |  63 ++++++
 .../quickinput/quickInputCheckboxList.ts      | 194 ++++++++++++++++++
 4 files changed, 282 insertions(+), 82 deletions(-)
 create mode 100644 src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
 create mode 100644 src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index b8e411d30cf..6b8fcbd826d 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -12,6 +12,10 @@
 	margin-left: -300px;
 }
 
+.quick-input-box {
+	margin: 6px;
+}
+
 .quick-input-actions {
 	padding: 3px;
 }
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index dd1b1817aa2..c6d52227e3b 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -10,10 +10,7 @@ import { Component } from 'vs/workbench/common/component';
 import { IQuickInputService } from 'vs/platform/quickInput/common/quickInput';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { Dimension } from 'vs/base/browser/builder';
-import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
 import * as dom from 'vs/base/browser/dom';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
 import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
@@ -21,70 +18,11 @@ import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/th
 import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { QuickInputCheckboxList } from './quickInputCheckboxList';
+import { QuickInputBox } from './quickInputBox';
 
 const $ = dom.$;
 
-export interface ISelectedElement {
-	item: object;
-	label: string;
-	selected: boolean;
-}
-
-interface ISelectedElementTemplateData {
-	element: HTMLElement;
-	name: HTMLElement;
-	checkbox: HTMLInputElement;
-	context: ISelectedElement;
-	toDispose: IDisposable[];
-}
-
-class SelectedElementRenderer implements IRenderer<ISelectedElement, ISelectedElementTemplateData> {
-
-	static readonly ID = 'selectedelement';
-
-	get templateId() {
-		return SelectedElementRenderer.ID;
-	}
-
-	renderTemplate(container: HTMLElement): ISelectedElementTemplateData {
-		const data: ISelectedElementTemplateData = Object.create(null);
-		data.element = dom.append(container, $('.selected_element'));
-
-		data.checkbox = <HTMLInputElement>$('input');
-		data.checkbox.type = 'checkbox';
-		data.toDispose = [];
-		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => data.context.selected = !data.context.selected));
-
-		dom.append(data.element, data.checkbox);
-
-		data.name = dom.append(data.element, $('span.label'));
-
-		return data;
-	}
-
-	renderElement(element: ISelectedElement, index: number, data: ISelectedElementTemplateData): void {
-		data.context = element;
-		data.name.textContent = element.label;
-		data.element.title = data.name.textContent;
-		data.checkbox.checked = element.selected;
-	}
-
-	disposeTemplate(templateData: ISelectedElementTemplateData): void {
-		dispose(templateData.toDispose);
-	}
-}
-
-class SelectedElementDelegate implements IDelegate<ISelectedElement> {
-
-	getHeight(element: ISelectedElement): number {
-		return 22;
-	}
-
-	getTemplateId(element: ISelectedElement): string {
-		return SelectedElementRenderer.ID;
-	}
-}
-
 export class QuickInputService extends Component implements IQuickInputService {
 
 	public _serviceBrand: any;
@@ -95,9 +33,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	private layoutDimensions: Dimension;
 	private container: HTMLElement;
-	private list: WorkbenchList<ISelectedElement>;
+	private inputBox: QuickInputBox;
+	private checkboxList: QuickInputCheckboxList;
 
-	private elements: ISelectedElement[] = [];
 	private resolve: (value?: object[] | Thenable<object[]>) => void;
 
 	constructor(
@@ -117,12 +55,13 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.container = dom.append(workbench, $('.quick-input-widget'));
 		this.container.style.display = 'none';
 
-		const listContainer = dom.append(this.container, $('.quick-input-list'));
-		const delegate = new SelectedElementDelegate();
-		this.list = this.instantiationService.createInstance(WorkbenchList, listContainer, delegate, [new SelectedElementRenderer()], {
-			identityProvider: element => element.label,
-			multipleSelectionSupport: false
-		}) as WorkbenchList<ISelectedElement>;
+		this.inputBox = new QuickInputBox(this.container);
+		this.inputBox.style(this.themeService.getTheme());
+		this.inputBox.onInput(value => {
+			this.checkboxList.filter(value);
+		});
+
+		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 
 		const buttonContainer = dom.append(this.container, $('.quick-input-actions'));
 		const cancel = dom.append(buttonContainer, $('button'));
@@ -144,7 +83,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	private close(ok: boolean) {
 		if (ok) {
-			this.resolve(this.elements.filter(e => e.selected).map(e => e.item));
+			this.resolve(this.checkboxList.getSelectedElements());
 		} else {
 			this.resolve();
 		}
@@ -154,18 +93,13 @@ export class QuickInputService extends Component implements IQuickInputService {
 	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]> {
 		this.create();
 
+		this.inputBox.setPlaceholder(options.placeHolder || '');
 		// TODO: Progress indication.
-		this.elements = (await picks).map(item => ({
-			item,
-			label: item.label,
-			selected: !!item.selected
-		}));
-		this.list.splice(0, this.list.length, this.elements);
+		this.checkboxList.setElements(await picks);
 
 		this.container.style.display = null;
 		this.updateLayout();
-		this.list.focusFirst();
-		this.list.domFocus();
+		this.inputBox.setFocus();
 
 		return new TPromise<T[]>(resolve => this.resolve = resolve);
 	}
@@ -185,9 +119,14 @@ export class QuickInputService extends Component implements IQuickInputService {
 			style.width = width + 'px';
 			style.marginLeft = '-' + (width / 2) + 'px';
 
-			this.list.layout();
+			this.inputBox.layout();
+			this.checkboxList.layout();
 		}
 	}
+
+	protected updateStyles() {
+		this.inputBox.style(this.themeService.getTheme());
+	}
 }
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
new file mode 100644
index 00000000000..e3e99bfbb40
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./quickInput';
+import * as dom from 'vs/base/browser/dom';
+import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import * as nls from 'vs/nls';
+import { inputBackground, inputForeground, inputBorder } from 'vs/platform/theme/common/colorRegistry';
+import { ITheme } from 'vs/platform/theme/common/themeService';
+import { IDisposable } from 'vs/base/common/lifecycle';
+
+const $ = dom.$;
+
+const DEFAULT_INPUT_ARIA_LABEL = nls.localize('quickInputBoxAriaLabel', "Type to narrow down results.");
+
+export class QuickInputBox {
+
+	public container: HTMLElement;
+	private inputBox: InputBox;
+
+	constructor(
+		private parent: HTMLElement
+	) {
+		this.container = dom.append(this.parent, $('.quick-input-box'));
+		this.inputBox = new InputBox(this.container, null, {
+			ariaLabel: DEFAULT_INPUT_ARIA_LABEL
+		});
+
+		// ARIA
+		const inputElement = this.inputBox.inputElement;
+		inputElement.setAttribute('role', 'combobox');
+		inputElement.setAttribute('aria-haspopup', 'false');
+		inputElement.setAttribute('aria-autocomplete', 'list');
+	}
+
+	onInput(handler: (event: string) => void): IDisposable {
+		return this.inputBox.onDidChange(handler);
+	}
+
+	setPlaceholder(placeholder: string) {
+		this.inputBox.setPlaceHolder(placeholder);
+	}
+
+	setFocus(): void {
+		this.inputBox.focus();
+	}
+
+	layout(): void {
+		this.inputBox.layout();
+	}
+
+	style(theme: ITheme) {
+		this.inputBox.style({
+			inputForeground: theme.getColor(inputForeground),
+			inputBackground: theme.getColor(inputBackground),
+			inputBorder: theme.getColor(inputBorder)
+		});
+	}
+}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
new file mode 100644
index 00000000000..d973dbf3292
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./quickInput';
+import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import * as dom from 'vs/base/browser/dom';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
+import { IMatch } from 'vs/base/common/filters';
+import { matchesFuzzyOcticonAware, parseOcticons } from 'vs/base/common/octicon';
+import { compareAnything } from 'vs/base/common/comparers';
+
+const $ = dom.$;
+
+export interface ISelectedElement {
+	index: number;
+	item: object;
+	label: string;
+	shouldAlwaysShow?: boolean;
+	hidden?: boolean;
+	selected?: boolean;
+	labelHighlights?: IMatch[];
+	descriptionHighlights?: IMatch[];
+	detailHighlights?: IMatch[];
+}
+
+interface ISelectedElementTemplateData {
+	element: HTMLElement;
+	name: HTMLElement;
+	checkbox: HTMLInputElement;
+	context: ISelectedElement;
+	toDispose: IDisposable[];
+}
+
+class SelectedElementRenderer implements IRenderer<ISelectedElement, ISelectedElementTemplateData> {
+
+	static readonly ID = 'selectedelement';
+
+	get templateId() {
+		return SelectedElementRenderer.ID;
+	}
+
+	renderTemplate(container: HTMLElement): ISelectedElementTemplateData {
+		const data: ISelectedElementTemplateData = Object.create(null);
+		data.element = dom.append(container, $('.selected_element'));
+
+		data.checkbox = <HTMLInputElement>$('input');
+		data.checkbox.type = 'checkbox';
+		data.toDispose = [];
+		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => data.context.selected = !data.context.selected));
+
+		dom.append(data.element, data.checkbox);
+
+		data.name = dom.append(data.element, $('span.label'));
+
+		return data;
+	}
+
+	renderElement(element: ISelectedElement, index: number, data: ISelectedElementTemplateData): void {
+		data.context = element;
+		data.name.textContent = element.label;
+		data.element.title = data.name.textContent;
+		data.checkbox.checked = element.selected;
+	}
+
+	disposeTemplate(templateData: ISelectedElementTemplateData): void {
+		dispose(templateData.toDispose);
+	}
+}
+
+class SelectedElementDelegate implements IDelegate<ISelectedElement> {
+
+	getHeight(element: ISelectedElement): number {
+		return 22;
+	}
+
+	getTemplateId(element: ISelectedElement): string {
+		return SelectedElementRenderer.ID;
+	}
+}
+
+export class QuickInputCheckboxList {
+
+	container: HTMLElement;
+	private list: WorkbenchList<ISelectedElement>;
+	private elements: ISelectedElement[] = [];
+
+	constructor(
+		private parent: HTMLElement,
+		@IInstantiationService private instantiationService: IInstantiationService
+	) {
+		this.container = dom.append(this.parent, $('.quick-input-checkbox-list'));
+		const delegate = new SelectedElementDelegate();
+		this.list = this.instantiationService.createInstance(WorkbenchList, this.container, delegate, [new SelectedElementRenderer()], {
+			identityProvider: element => element.label,
+			multipleSelectionSupport: false
+		}) as WorkbenchList<ISelectedElement>;
+	}
+
+	setElements(elements: IPickOpenEntry[]): void {
+		this.elements = elements.map((item, index) => ({
+			index,
+			item,
+			label: item.label,
+			selected: !!item.selected
+		}));
+		this.list.splice(0, this.list.length, this.elements);
+	}
+
+	getSelectedElements() {
+		return this.elements.filter(e => e.selected)
+			.map(e => e.item);
+	}
+
+	setFocus(): void {
+		this.list.focusFirst();
+		this.list.domFocus();
+	}
+
+	layout(): void {
+		this.list.layout();
+	}
+
+	filter(query: string) {
+		query = query.trim();
+
+		// Reset filtering
+		if (!query) {
+			this.elements.forEach(element => {
+				element.labelHighlights = undefined;
+				element.descriptionHighlights = undefined;
+				element.detailHighlights = undefined;
+				element.hidden = false;
+			});
+		}
+
+		// Filter by value (since we support octicons, use octicon aware fuzzy matching)
+		else {
+			this.elements.forEach(element => {
+				const labelHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.label));
+				const descriptionHighlights = undefined; // TODO matchesFuzzyOcticonAware(query, parseOcticons(element.description));
+				const detailHighlights = undefined; // TODO matchesFuzzyOcticonAware(query, parseOcticons(element.detail));
+
+				if (element.shouldAlwaysShow || labelHighlights || descriptionHighlights || detailHighlights) {
+					element.labelHighlights = labelHighlights;
+					element.descriptionHighlights = descriptionHighlights;
+					element.detailHighlights = detailHighlights;
+					element.hidden = false;
+				} else {
+					element.labelHighlights = undefined;
+					element.descriptionHighlights = undefined;
+					element.detailHighlights = undefined;
+					element.hidden = true;
+				}
+			});
+		}
+
+		// Sort by value
+		const normalizedSearchValue = query.toLowerCase();
+		this.elements.sort((a, b) => {
+			if (!query) {
+				return a.index - b.index; // restore natural order
+			}
+			return compareEntries(a, b, normalizedSearchValue);
+		});
+
+		this.list.splice(0, this.list.length, this.elements.filter(element => !element.hidden));
+		this.list.layout();
+		if (query) {
+			this.list.focusFirst();
+		}
+	}
+}
+
+function compareEntries(elementA: ISelectedElement, elementB: ISelectedElement, lookFor: string): number {
+
+	const labelHighlightsA = elementA.labelHighlights || [];
+	const labelHighlightsB = elementB.labelHighlights || [];
+	if (labelHighlightsA.length && !labelHighlightsB.length) {
+		return -1;
+	}
+
+	if (!labelHighlightsA.length && labelHighlightsB.length) {
+		return 1;
+	}
+
+	return compareAnything(elementA.label, elementB.label, lookFor);
+}
\ No newline at end of file

From 24a7cb0ca06a3389b1465ae37d6e8a83cbed77b5 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 20 Mar 2018 12:47:52 +0100
Subject: [PATCH 027/383] Keyboard access (#45589)

---
 .../browser/parts/quickinput/quickInput.ts    | 41 ++++++++
 .../browser/parts/quickinput/quickInputBox.ts | 17 +++-
 .../quickinput/quickInputCheckboxList.ts      | 98 ++++++++++++++-----
 3 files changed, 130 insertions(+), 26 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index c6d52227e3b..94358b25a9c 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -20,6 +20,8 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { QuickInputCheckboxList } from './quickInputCheckboxList';
 import { QuickInputBox } from './quickInputBox';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 const $ = dom.$;
 
@@ -56,12 +58,35 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.container.style.display = 'none';
 
 		this.inputBox = new QuickInputBox(this.container);
+		this.toUnbind.push(this.inputBox);
 		this.inputBox.style(this.themeService.getTheme());
 		this.inputBox.onInput(value => {
 			this.checkboxList.filter(value);
 		});
+		this.toUnbind.push(this.inputBox.onKeyDown(event => {
+			switch (event.keyCode) {
+				case KeyCode.DownArrow:
+					this.checkboxList.focus('Next');
+					break;
+				case KeyCode.UpArrow:
+					this.checkboxList.focus('Previous');
+					break;
+				case KeyCode.PageDown:
+					this.checkboxList.focus('NextPage');
+					break;
+				case KeyCode.PageUp:
+					this.checkboxList.focus('PreviousPage');
+					break;
+				case KeyCode.Space:
+					if (event.ctrlKey) {
+						this.checkboxList.toggleCheckbox();
+					}
+					break;
+			}
+		}));
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
+		this.toUnbind.push(this.checkboxList);
 
 		const buttonContainer = dom.append(this.container, $('.quick-input-actions'));
 		const cancel = dom.append(buttonContainer, $('button'));
@@ -79,6 +104,19 @@ export class QuickInputService extends Component implements IQuickInputService {
 			}
 			this.close(false);
 		}));
+		this.toUnbind.push(dom.addDisposableListener(this.container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			switch (event.keyCode) {
+				case KeyCode.Enter:
+					dom.EventHelper.stop(e, true);
+					this.close(true);
+					break;
+				case KeyCode.Escape:
+					dom.EventHelper.stop(e, true);
+					this.close(false);
+					break;
+			}
+		}));
 	}
 
 	private close(ok: boolean) {
@@ -92,6 +130,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]> {
 		this.create();
+		if (this.resolve) {
+			this.resolve(undefined);
+		}
 
 		this.inputBox.setPlaceholder(options.placeHolder || '');
 		// TODO: Progress indication.
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
index e3e99bfbb40..1a2cfb71e6e 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -11,7 +11,8 @@ import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import * as nls from 'vs/nls';
 import { inputBackground, inputForeground, inputBorder } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme } from 'vs/platform/theme/common/themeService';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 const $ = dom.$;
 
@@ -19,8 +20,9 @@ const DEFAULT_INPUT_ARIA_LABEL = nls.localize('quickInputBoxAriaLabel', "Type to
 
 export class QuickInputBox {
 
-	public container: HTMLElement;
+	private container: HTMLElement;
 	private inputBox: InputBox;
+	private disposables: IDisposable[] = [];
 
 	constructor(
 		private parent: HTMLElement
@@ -29,6 +31,7 @@ export class QuickInputBox {
 		this.inputBox = new InputBox(this.container, null, {
 			ariaLabel: DEFAULT_INPUT_ARIA_LABEL
 		});
+		this.disposables.push(this.inputBox);
 
 		// ARIA
 		const inputElement = this.inputBox.inputElement;
@@ -37,6 +40,12 @@ export class QuickInputBox {
 		inputElement.setAttribute('aria-autocomplete', 'list');
 	}
 
+	onKeyDown(handler: (event: StandardKeyboardEvent) => void): IDisposable {
+		return dom.addDisposableListener(this.inputBox.inputElement, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			handler(new StandardKeyboardEvent(e));
+		});
+	}
+
 	onInput(handler: (event: string) => void): IDisposable {
 		return this.inputBox.onDidChange(handler);
 	}
@@ -60,4 +69,8 @@ export class QuickInputBox {
 			inputBorder: theme.getColor(inputBorder)
 		});
 	}
+
+	dispose() {
+		this.disposables = dispose(this.disposables);
+	}
 }
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index d973dbf3292..a50fd1b84b5 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -15,30 +15,57 @@ import { IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { IMatch } from 'vs/base/common/filters';
 import { matchesFuzzyOcticonAware, parseOcticons } from 'vs/base/common/octicon';
 import { compareAnything } from 'vs/base/common/comparers';
+import { Emitter } from 'vs/base/common/event';
+import { assign } from 'vs/base/common/objects';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 const $ = dom.$;
 
-export interface ISelectedElement {
+interface ISelectableElement {
 	index: number;
 	item: object;
 	label: string;
-	shouldAlwaysShow?: boolean;
-	hidden?: boolean;
-	selected?: boolean;
+	selected: boolean;
+}
+
+class SelectableElement implements ISelectableElement {
+	index: number;
+	item: object;
+	label: string;
+	shouldAlwaysShow = false;
+	hidden = false;
+	private _onSelected = new Emitter<boolean>();
+	onSelected = this._onSelected.event;
+	_selected: boolean;
+	get selected() {
+		return this._selected;
+	}
+	set selected(value: boolean) {
+		if (value !== this._selected) {
+			this._selected = value;
+			this._onSelected.fire(value);
+		}
+	}
 	labelHighlights?: IMatch[];
 	descriptionHighlights?: IMatch[];
 	detailHighlights?: IMatch[];
+
+	constructor(init: ISelectableElement) {
+		assign(this, init);
+	}
 }
 
 interface ISelectedElementTemplateData {
 	element: HTMLElement;
 	name: HTMLElement;
 	checkbox: HTMLInputElement;
-	context: ISelectedElement;
-	toDispose: IDisposable[];
+	context: SelectableElement;
+	toDisposeElement: IDisposable[];
+	toDisposeTemplate: IDisposable[];
 }
 
-class SelectedElementRenderer implements IRenderer<ISelectedElement, ISelectedElementTemplateData> {
+class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedElementTemplateData> {
 
 	static readonly ID = 'selectedelement';
 
@@ -52,8 +79,11 @@ class SelectedElementRenderer implements IRenderer<ISelectedElement, ISelectedEl
 
 		data.checkbox = <HTMLInputElement>$('input');
 		data.checkbox.type = 'checkbox';
-		data.toDispose = [];
-		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => data.context.selected = !data.context.selected));
+		data.toDisposeElement = [];
+		data.toDisposeTemplate = [];
+		data.toDisposeTemplate.push(dom.addStandardDisposableListener(data.checkbox, dom.EventType.CHANGE, e => {
+			data.context.selected = data.checkbox.checked;
+		}));
 
 		dom.append(data.element, data.checkbox);
 
@@ -62,34 +92,37 @@ class SelectedElementRenderer implements IRenderer<ISelectedElement, ISelectedEl
 		return data;
 	}
 
-	renderElement(element: ISelectedElement, index: number, data: ISelectedElementTemplateData): void {
+	renderElement(element: SelectableElement, index: number, data: ISelectedElementTemplateData): void {
+		dispose(data.toDisposeElement);
 		data.context = element;
 		data.name.textContent = element.label;
 		data.element.title = data.name.textContent;
 		data.checkbox.checked = element.selected;
+		data.toDisposeElement.push(element.onSelected(selected => data.checkbox.checked = selected));
 	}
 
-	disposeTemplate(templateData: ISelectedElementTemplateData): void {
-		dispose(templateData.toDispose);
+	disposeTemplate(data: ISelectedElementTemplateData): void {
+		dispose(data.toDisposeTemplate);
 	}
 }
 
-class SelectedElementDelegate implements IDelegate<ISelectedElement> {
+class SelectedElementDelegate implements IDelegate<SelectableElement> {
 
-	getHeight(element: ISelectedElement): number {
+	getHeight(element: SelectableElement): number {
 		return 22;
 	}
 
-	getTemplateId(element: ISelectedElement): string {
+	getTemplateId(element: SelectableElement): string {
 		return SelectedElementRenderer.ID;
 	}
 }
 
 export class QuickInputCheckboxList {
 
-	container: HTMLElement;
-	private list: WorkbenchList<ISelectedElement>;
-	private elements: ISelectedElement[] = [];
+	private container: HTMLElement;
+	private list: WorkbenchList<SelectableElement>;
+	private elements: SelectableElement[] = [];
+	private disposables: IDisposable[] = [];
 
 	constructor(
 		private parent: HTMLElement,
@@ -100,11 +133,18 @@ export class QuickInputCheckboxList {
 		this.list = this.instantiationService.createInstance(WorkbenchList, this.container, delegate, [new SelectedElementRenderer()], {
 			identityProvider: element => element.label,
 			multipleSelectionSupport: false
-		}) as WorkbenchList<ISelectedElement>;
+		}) as WorkbenchList<SelectableElement>;
+		this.disposables.push(this.list);
+		this.disposables.push(this.list.onKeyDown(e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.keyCode === KeyCode.Space) {
+				this.toggleCheckbox();
+			}
+		}));
 	}
 
 	setElements(elements: IPickOpenEntry[]): void {
-		this.elements = elements.map((item, index) => ({
+		this.elements = elements.map((item, index) => new SelectableElement({
 			index,
 			item,
 			label: item.label,
@@ -118,9 +158,8 @@ export class QuickInputCheckboxList {
 			.map(e => e.item);
 	}
 
-	setFocus(): void {
-		this.list.focusFirst();
-		this.list.domFocus();
+	focus(what: 'Next' | 'Previous' | 'NextPage' | 'PreviousPage'): void {
+		this.list['focus' + what]();
 	}
 
 	layout(): void {
@@ -176,9 +215,20 @@ export class QuickInputCheckboxList {
 			this.list.focusFirst();
 		}
 	}
+
+	toggleCheckbox() {
+		const elements = this.list.getFocusedElements();
+		for (const element of elements) {
+			element.selected = !element.selected;
+		}
+	}
+
+	dispose() {
+		this.disposables = dispose(this.disposables);
+	}
 }
 
-function compareEntries(elementA: ISelectedElement, elementB: ISelectedElement, lookFor: string): number {
+function compareEntries(elementA: SelectableElement, elementB: SelectableElement, lookFor: string): number {
 
 	const labelHighlightsA = elementA.labelHighlights || [];
 	const labelHighlightsB = elementB.labelHighlights || [];

From 60729e01d81c5f6883565dd5c042c7cc00a03f31 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 20 Mar 2018 15:52:38 +0100
Subject: [PATCH 028/383] Single OK button right of filter text (#45589)

---
 .../browser/parts/quickinput/quickInput.css   | 24 ++++++++++++-------
 .../browser/parts/quickinput/quickInput.ts    | 22 ++++++++---------
 .../browser/parts/quickinput/quickInputBox.ts |  4 ++--
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 6b8fcbd826d..3e0cdbea6a1 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -12,21 +12,29 @@
 	margin-left: -300px;
 }
 
+.quick-input-header {
+	display: flex;
+	padding: 6px;
+}
+
 .quick-input-box {
-	margin: 6px;
+	flex-grow: 1;
 }
 
-.quick-input-actions {
-	padding: 3px;
+.quick-input-box .monaco-inputbox > .wrapper > .input {
+	padding-left: 14px;
 }
 
-.quick-input-actions button {
+.quick-input-action {
+	margin-left: 6px;
 	border: 0;
 	padding: 0px 4px 1px 4px;
-	float: right;
-	margin-left: 4px;
 }
 
-.quick-input-actions button:focus {
+.quick-input-action:focus {
 	outline:0;
-}
\ No newline at end of file
+}
+
+.quick-input-checkbox-list {
+	margin-left: 3px;
+}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 94358b25a9c..56a0961c762 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -22,6 +22,7 @@ import { QuickInputCheckboxList } from './quickInputCheckboxList';
 import { QuickInputBox } from './quickInputBox';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { localize } from 'vs/nls';
 
 const $ = dom.$;
 
@@ -57,7 +58,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.container = dom.append(workbench, $('.quick-input-widget'));
 		this.container.style.display = 'none';
 
-		this.inputBox = new QuickInputBox(this.container);
+		const headerContainer = dom.append(this.container, $('.quick-input-header'));
+
+		this.inputBox = new QuickInputBox(headerContainer);
 		this.toUnbind.push(this.inputBox);
 		this.inputBox.style(this.themeService.getTheme());
 		this.inputBox.onInput(value => {
@@ -85,17 +88,13 @@ export class QuickInputService extends Component implements IQuickInputService {
 			}
 		}));
 
+		const ok = dom.append(headerContainer, $('button.quick-input-action'));
+		ok.textContent = localize('ok', "OK");
+		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(true)));
+
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
 
-		const buttonContainer = dom.append(this.container, $('.quick-input-actions'));
-		const cancel = dom.append(buttonContainer, $('button'));
-		cancel.textContent = 'Cancel'; // TODO
-		this.toUnbind.push(dom.addDisposableListener(cancel, dom.EventType.CLICK, e => this.close(false)));
-		const ok = dom.append(buttonContainer, $('button'));
-		ok.textContent = 'OK'; // TODO
-		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(true)));
-
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
 			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
 				if (element === this.container) {
@@ -184,7 +183,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	const buttonBackgroundColor = theme.getColor(buttonBackground);
 	const buttonForegroundColor = theme.getColor(buttonForeground);
-	collector.addRule(`.quick-input-actions button {
+	collector.addRule(`.quick-input-action {
 		${buttonBackgroundColor ? `background-color: ${buttonBackgroundColor};` : ''}
 		${buttonForegroundColor ? `color: ${buttonForegroundColor};` : ''}
 		${contrastBorderColor ? `border: 1px solid ${contrastBorderColor};` : ''}
@@ -192,6 +191,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	const buttonHoverBackgroundColor = theme.getColor(buttonHoverBackground);
 	if (buttonHoverBackgroundColor) {
-		collector.addRule(`.quick-input-actions button:hover { background-color: ${buttonHoverBackgroundColor}; }`);
+		collector.addRule(`.quick-input-action:hover { background-color: ${buttonHoverBackgroundColor}; }`);
+		collector.addRule(`.quick-input-action:focus { background-color: ${buttonHoverBackgroundColor}; }`);
 	}
 });
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
index 1a2cfb71e6e..0e7c127d58c 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./quickInput';
 import * as dom from 'vs/base/browser/dom';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import * as nls from 'vs/nls';
+import { localize } from 'vs/nls';
 import { inputBackground, inputForeground, inputBorder } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme } from 'vs/platform/theme/common/themeService';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
@@ -16,7 +16,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 const $ = dom.$;
 
-const DEFAULT_INPUT_ARIA_LABEL = nls.localize('quickInputBoxAriaLabel', "Type to narrow down results.");
+const DEFAULT_INPUT_ARIA_LABEL = localize('quickInputBoxAriaLabel', "Type to narrow down results.");
 
 export class QuickInputBox {
 

From 65d5eb5686311c83866cd3435246383c69ef3541 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 21 Mar 2018 10:27:04 +0100
Subject: [PATCH 029/383] Label, description, detail (#45589)

---
 .../electron-browser/mainThreadQuickOpen.ts   |  4 +-
 .../browser/parts/quickinput/quickInput.css   | 45 ++++++++++++-
 .../browser/parts/quickinput/quickInput.ts    | 12 +++-
 .../browser/parts/quickinput/quickInputBox.ts |  6 +-
 .../quickinput/quickInputCheckboxList.ts      | 66 ++++++++++++-------
 5 files changed, 103 insertions(+), 30 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index 959efeff31d..c2e42dc13b6 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -17,6 +17,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	private _proxy: ExtHostQuickOpenShape;
 	private _quickOpenService: IQuickOpenService;
+	private _quickInputService: IQuickInputService;
 	private _doSetItems: (items: MyQuickPickItems[]) => any;
 	private _doSetError: (error: Error) => any;
 	private _contents: TPromise<MyQuickPickItems[]>;
@@ -25,10 +26,11 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	constructor(
 		extHostContext: IExtHostContext,
 		@IQuickOpenService quickOpenService: IQuickOpenService,
-		@IQuickInputService private _quickInputService: IQuickInputService
+		@IQuickInputService quickInputService: IQuickInputService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostQuickOpen);
 		this._quickOpenService = quickOpenService;
+		this._quickInputService = quickInputService;
 	}
 
 	public dispose(): void {
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 3e0cdbea6a1..a51f0f1d7d1 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -22,7 +22,7 @@
 }
 
 .quick-input-box .monaco-inputbox > .wrapper > .input {
-	padding-left: 14px;
+	padding-left: 15px;
 }
 
 .quick-input-action {
@@ -37,4 +37,47 @@
 
 .quick-input-checkbox-list {
 	margin-left: 3px;
+	line-height: 22px;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-entry {
+	overflow: hidden;
+	display: flex;
+	height: 100%;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-label {
+	overflow: hidden;
+	display: flex;
+	height: 100%;
+	flex: 1;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-checkbox {
+	align-self: center;
+	/* margin-top: 5px; */
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-rows {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	flex: 1;
+	margin-left: 1px;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-rows > .quick-input-checkbox-list-row {
+	display: flex;
+	align-items: center;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-rows .monaco-highlighted-label span {
+	opacity: 1;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-label-meta {
+	opacity: 0.7;
+	line-height: normal;
 }
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 56a0961c762..6475c430a32 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -23,6 +23,8 @@ import { QuickInputBox } from './quickInputBox';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
 
 const $ = dom.$;
 
@@ -42,6 +44,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private resolve: (value?: object[] | Thenable<object[]>) => void;
 
 	constructor(
+		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPartService private partService: IPartService,
 		@IThemeService themeService: IThemeService
@@ -63,7 +66,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.inputBox = new QuickInputBox(headerContainer);
 		this.toUnbind.push(this.inputBox);
 		this.inputBox.style(this.themeService.getTheme());
-		this.inputBox.onInput(value => {
+		this.inputBox.onDidChange(value => {
 			this.checkboxList.filter(value);
 		});
 		this.toUnbind.push(this.inputBox.onKeyDown(event => {
@@ -101,7 +104,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 					return;
 				}
 			}
-			this.close(false);
+			if (this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
+				this.close(false);
+			}
 		}));
 		this.toUnbind.push(dom.addDisposableListener(this.container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
@@ -130,9 +135,10 @@ export class QuickInputService extends Component implements IQuickInputService {
 	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]> {
 		this.create();
 		if (this.resolve) {
-			this.resolve(undefined);
+			this.resolve();
 		}
 
+		this.inputBox.setValue('');
 		this.inputBox.setPlaceholder(options.placeHolder || '');
 		// TODO: Progress indication.
 		this.checkboxList.setElements(await picks);
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
index 0e7c127d58c..2c780a001a2 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -46,10 +46,14 @@ export class QuickInputBox {
 		});
 	}
 
-	onInput(handler: (event: string) => void): IDisposable {
+	onDidChange(handler: (event: string) => void): IDisposable {
 		return this.inputBox.onDidChange(handler);
 	}
 
+	setValue(value: string) {
+		this.inputBox.value = value;
+	}
+
 	setPlaceholder(placeholder: string) {
 		this.inputBox.setPlaceHolder(placeholder);
 	}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index a50fd1b84b5..06b3f268b78 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -19,20 +19,20 @@ import { Emitter } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 
 const $ = dom.$;
 
 interface ISelectableElement {
 	index: number;
-	item: object;
-	label: string;
+	item: IPickOpenEntry;
 	selected: boolean;
 }
 
 class SelectableElement implements ISelectableElement {
 	index: number;
-	item: object;
-	label: string;
+	item: IPickOpenEntry;
 	shouldAlwaysShow = false;
 	hidden = false;
 	private _onSelected = new Emitter<boolean>();
@@ -57,10 +57,10 @@ class SelectableElement implements ISelectableElement {
 }
 
 interface ISelectedElementTemplateData {
-	element: HTMLElement;
-	name: HTMLElement;
 	checkbox: HTMLInputElement;
-	context: SelectableElement;
+	label: IconLabel;
+	detail: HighlightedLabel;
+	element: SelectableElement;
 	toDisposeElement: IDisposable[];
 	toDisposeTemplate: IDisposable[];
 }
@@ -75,30 +75,50 @@ class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedE
 
 	renderTemplate(container: HTMLElement): ISelectedElementTemplateData {
 		const data: ISelectedElementTemplateData = Object.create(null);
-		data.element = dom.append(container, $('.selected_element'));
 
-		data.checkbox = <HTMLInputElement>$('input');
+		const entry = dom.append(container, $('.quick-input-checkbox-list-entry'));
+		const label = dom.append(entry, $('label.quick-input-checkbox-list-label'));
+
+		// Entry
+		data.checkbox = <HTMLInputElement>dom.append(label, $('input.quick-input-checkbox-list-checkbox'));
 		data.checkbox.type = 'checkbox';
 		data.toDisposeElement = [];
 		data.toDisposeTemplate = [];
 		data.toDisposeTemplate.push(dom.addStandardDisposableListener(data.checkbox, dom.EventType.CHANGE, e => {
-			data.context.selected = data.checkbox.checked;
+			data.element.selected = data.checkbox.checked;
 		}));
 
-		dom.append(data.element, data.checkbox);
+		const rows = dom.append(label, $('.quick-input-checkbox-list-rows'));
+		const row1 = dom.append(rows, $('.quick-input-checkbox-list-row'));
+		const row2 = dom.append(rows, $('.quick-input-checkbox-list-row'));
 
-		data.name = dom.append(data.element, $('span.label'));
+		// Label
+		data.label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true });
+
+		// Detail
+		const detailContainer = dom.append(row2, $('.quick-input-checkbox-list-label-meta'));
+		data.detail = new HighlightedLabel(detailContainer);
 
 		return data;
 	}
 
 	renderElement(element: SelectableElement, index: number, data: ISelectedElementTemplateData): void {
 		dispose(data.toDisposeElement);
-		data.context = element;
-		data.name.textContent = element.label;
-		data.element.title = data.name.textContent;
+		data.element = element;
 		data.checkbox.checked = element.selected;
 		data.toDisposeElement.push(element.onSelected(selected => data.checkbox.checked = selected));
+
+		const { labelHighlights, descriptionHighlights, detailHighlights } = element;
+
+		// Label
+		const options: IIconLabelValueOptions = Object.create(null);
+		options.matches = labelHighlights || [];
+		options.descriptionTitle = element.item.description;
+		options.descriptionMatches = descriptionHighlights || [];
+		data.label.setValue(element.item.label, element.item.description, options);
+
+		// Meta
+		data.detail.set(element.item.detail, detailHighlights);
 	}
 
 	disposeTemplate(data: ISelectedElementTemplateData): void {
@@ -109,7 +129,7 @@ class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedE
 class SelectedElementDelegate implements IDelegate<SelectableElement> {
 
 	getHeight(element: SelectableElement): number {
-		return 22;
+		return element.item.detail ? 44 : 22;
 	}
 
 	getTemplateId(element: SelectableElement): string {
@@ -147,10 +167,10 @@ export class QuickInputCheckboxList {
 		this.elements = elements.map((item, index) => new SelectableElement({
 			index,
 			item,
-			label: item.label,
 			selected: !!item.selected
 		}));
 		this.list.splice(0, this.list.length, this.elements);
+		this.list.focusFirst();
 	}
 
 	getSelectedElements() {
@@ -182,9 +202,9 @@ export class QuickInputCheckboxList {
 		// Filter by value (since we support octicons, use octicon aware fuzzy matching)
 		else {
 			this.elements.forEach(element => {
-				const labelHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.label));
-				const descriptionHighlights = undefined; // TODO matchesFuzzyOcticonAware(query, parseOcticons(element.description));
-				const detailHighlights = undefined; // TODO matchesFuzzyOcticonAware(query, parseOcticons(element.detail));
+				const labelHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.label));
+				const descriptionHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.description || ''));
+				const detailHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.detail || ''));
 
 				if (element.shouldAlwaysShow || labelHighlights || descriptionHighlights || detailHighlights) {
 					element.labelHighlights = labelHighlights;
@@ -211,9 +231,7 @@ export class QuickInputCheckboxList {
 
 		this.list.splice(0, this.list.length, this.elements.filter(element => !element.hidden));
 		this.list.layout();
-		if (query) {
-			this.list.focusFirst();
-		}
+		this.list.focusFirst();
 	}
 
 	toggleCheckbox() {
@@ -240,5 +258,5 @@ function compareEntries(elementA: SelectableElement, elementB: SelectableElement
 		return 1;
 	}
 
-	return compareAnything(elementA.label, elementB.label, lookFor);
+	return compareAnything(elementA.item.label, elementB.item.label, lookFor);
 }
\ No newline at end of file

From 0fd46e993880a43ed6dc6611ca5ca14072d2f3bc Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 21 Mar 2018 11:03:03 +0100
Subject: [PATCH 030/383] Show only one picker at a time (#45589)

---
 .../browser/parts/quickinput/quickInput.ts       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 6475c430a32..48f3e382492 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -15,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
 import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
-import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
+import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { QuickInputCheckboxList } from './quickInputCheckboxList';
@@ -47,6 +47,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPartService private partService: IPartService,
+		@IQuickOpenService private quickOpenService: IQuickOpenService,
 		@IThemeService themeService: IThemeService
 	) {
 		super(QuickInputService.ID, themeService);
@@ -121,19 +122,24 @@ export class QuickInputService extends Component implements IQuickInputService {
 					break;
 			}
 		}));
+
+		this.toUnbind.push(this.quickOpenService.onShow(() => this.close(false)));
 	}
 
 	private close(ok: boolean) {
-		if (ok) {
-			this.resolve(this.checkboxList.getSelectedElements());
-		} else {
-			this.resolve();
+		if (this.resolve) {
+			if (ok) {
+				this.resolve(this.checkboxList.getSelectedElements());
+			} else {
+				this.resolve();
+			}
 		}
 		this.container.style.display = 'none';
 	}
 
 	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]> {
 		this.create();
+		this.quickOpenService.close();
 		if (this.resolve) {
 			this.resolve();
 		}

From a82ae7980eb4860c65ea6e363f2368091baa6d95 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 21 Mar 2018 11:03:45 +0100
Subject: [PATCH 031/383] Fix selection behavior (#45589)

---
 .../browser/parts/quickinput/quickInputCheckboxList.ts        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 06b3f268b78..6d79389d10e 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -170,6 +170,7 @@ export class QuickInputCheckboxList {
 			selected: !!item.selected
 		}));
 		this.list.splice(0, this.list.length, this.elements);
+		this.list.setSelection([]);
 		this.list.focusFirst();
 	}
 
@@ -230,8 +231,9 @@ export class QuickInputCheckboxList {
 		});
 
 		this.list.splice(0, this.list.length, this.elements.filter(element => !element.hidden));
-		this.list.layout();
+		this.list.setSelection([]);
 		this.list.focusFirst();
+		this.list.layout();
 	}
 
 	toggleCheckbox() {

From fe76fb26e20fa3b547bcd0d207c6e89c37b971d0 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 21 Mar 2018 11:18:19 +0100
Subject: [PATCH 032/383] Cmd+Space hint (#45589)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.ts    | 5 +++--
 src/vs/workbench/browser/parts/quickinput/quickInputBox.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 48f3e382492..d157108f074 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -34,7 +34,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	private static readonly ID = 'workbench.component.quickinput';
 	private static readonly MAX_WIDTH = 600;				// Max total width of quick open widget
-	// private static readonly MAX_ITEMS_HEIGHT = 20 * 22;	// Max height of item list below input field
+	// private static readonly MAX_ITEMS_HEIGHT = 20 * 22;	// TODO Max height of item list below input field
 
 	private layoutDimensions: Dimension;
 	private container: HTMLElement;
@@ -145,7 +145,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 		}
 
 		this.inputBox.setValue('');
-		this.inputBox.setPlaceholder(options.placeHolder || '');
+		// TODO: Localize shortcut.
+		this.inputBox.setPlaceholder(options.placeHolder ? localize('quickInput.ctrlSpaceToSelectWithPlaceholder', "{1} ({0} to toggle)", 'Cmd+Space', options.placeHolder) : localize('quickInput.ctrlSpaceToSelect', "{0} to toggle", 'Cmd+Space'));
 		// TODO: Progress indication.
 		this.checkboxList.setElements(await picks);
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
index 2c780a001a2..af3f90784a8 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -16,7 +16,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 const $ = dom.$;
 
-const DEFAULT_INPUT_ARIA_LABEL = localize('quickInputBoxAriaLabel', "Type to narrow down results.");
+const DEFAULT_INPUT_ARIA_LABEL = localize('quickInputBox.ariaLabel', "Type to narrow down results.");
 
 export class QuickInputBox {
 

From 546727170bef34d5aff96db8901127b07111d1a3 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 21 Mar 2018 11:36:54 +0100
Subject: [PATCH 033/383] Max height

---
 src/vs/workbench/browser/parts/quickinput/quickInput.css | 6 ++++++
 src/vs/workbench/browser/parts/quickinput/quickInput.ts  | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index a51f0f1d7d1..51e995e3317 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -40,6 +40,11 @@
 	line-height: 22px;
 }
 
+.quick-input-checkbox-list .monaco-list {
+	overflow: hidden;
+	max-height: calc(20 * 22px);
+}
+
 .quick-input-checkbox-list .quick-input-checkbox-list-entry {
 	overflow: hidden;
 	display: flex;
@@ -55,6 +60,7 @@
 
 .quick-input-checkbox-list .quick-input-checkbox-list-checkbox {
 	align-self: center;
+	/* TODO */
 	/* margin-top: 5px; */
 }
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index d157108f074..182ca41f986 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -34,7 +34,6 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	private static readonly ID = 'workbench.component.quickinput';
 	private static readonly MAX_WIDTH = 600;				// Max total width of quick open widget
-	// private static readonly MAX_ITEMS_HEIGHT = 20 * 22;	// TODO Max height of item list below input field
 
 	private layoutDimensions: Dimension;
 	private container: HTMLElement;

From 33dce47de9f6650b65d2fa32c21e7e9b7d39cb29 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 21 Mar 2018 15:54:55 +0100
Subject: [PATCH 034/383] Documentation (#45589)

---
 src/vs/platform/quickOpen/common/quickOpen.ts       |  3 +++
 src/vs/vscode.d.ts                                  | 13 +++++++++++--
 .../browser/parts/quickinput/quickInput.ts          |  4 +++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index a6a169303b9..eef2fa91bd5 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -86,6 +86,9 @@ export interface IPickOptions {
 	 */
 	contextKey?: string;
 
+	/**
+	 * an optional flag to make this picker multi-select (honoured by extension API)
+	 */
 	multiSelect?: boolean;
 }
 
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 0db6fc8d414..2295b78cdc1 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1554,6 +1554,9 @@ declare module 'vscode' {
 		 */
 		ignoreFocusOut?: boolean;
 
+		/**
+		 * An optional flag to make the picker multi-select, if true the result is an array of picks.
+		 */
 		multiSelect?: boolean;
 
 		/**
@@ -1562,10 +1565,16 @@ declare module 'vscode' {
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}
 
+	/**
+	 * Represents an item that can be selected in a multi-select quick pick UI.
+	 */
 	export interface MultiSelectQuickPickItem extends QuickPickItem {
 		selected?: boolean;
 	}
 
+	/**
+	 * Options to configure the behavior of the multi-select quick pick UI. (Marker type.)
+	 */
 	export interface MultiSelectQuickPickOptions extends QuickPickOptions {
 		multiSelect: true;
 	}
@@ -5077,7 +5086,7 @@ declare module 'vscode' {
 		 * @param items An array of strings, or a promise that resolves to an array of strings.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selection or `undefined`.
+		 * @return A promise that resolves to the selected item(s) or `undefined`.
 		 */
 		export function showQuickPick(items: string[] | Thenable<string[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<string[] | undefined>;
 		export function showQuickPick(items: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
@@ -5088,7 +5097,7 @@ declare module 'vscode' {
 		 * @param items An array of items, or a promise that resolves to an array of items.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected item or `undefined`.
+		 * @return A promise that resolves to the selected item(s) or `undefined`.
 		 */
 		export function showQuickPick<T extends MultiSelectQuickPickItem>(items: T[] | Thenable<T[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<T[] | undefined>;
 		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 182ca41f986..be6f2ff0d33 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -143,9 +143,11 @@ export class QuickInputService extends Component implements IQuickInputService {
 			this.resolve();
 		}
 
+		// TODO: Listen on cancellation token.
+
 		this.inputBox.setValue('');
 		// TODO: Localize shortcut.
-		this.inputBox.setPlaceholder(options.placeHolder ? localize('quickInput.ctrlSpaceToSelectWithPlaceholder', "{1} ({0} to toggle)", 'Cmd+Space', options.placeHolder) : localize('quickInput.ctrlSpaceToSelect', "{0} to toggle", 'Cmd+Space'));
+		this.inputBox.setPlaceholder(options.placeHolder ? localize('quickInput.ctrlSpaceToSelectWithPlaceholder', "{1} ({0} to toggle)", 'Ctrl+Space', options.placeHolder) : localize('quickInput.ctrlSpaceToSelect', "{0} to toggle", 'Ctrl+Space'));
 		// TODO: Progress indication.
 		this.checkboxList.setElements(await picks);
 

From e3b9da451d468e64273e3932b2b2e06eca594e5a Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 22 Mar 2018 10:27:39 +0100
Subject: [PATCH 035/383] Select All checkbox

---
 .../browser/parts/quickinput/quickInput.css   | 15 +++++++-----
 .../browser/parts/quickinput/quickInput.ts    | 12 ++++++++++
 .../quickinput/quickInputCheckboxList.ts      | 23 ++++++++++++++++---
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 51e995e3317..311de5fd355 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -17,12 +17,14 @@
 	padding: 6px;
 }
 
-.quick-input-box {
-	flex-grow: 1;
+.quick-input-select-all {
+	align-self: center;
+	margin: 0;
 }
 
-.quick-input-box .monaco-inputbox > .wrapper > .input {
-	padding-left: 15px;
+.quick-input-box {
+	flex-grow: 1;
+	margin-left: 5px;
 }
 
 .quick-input-action {
@@ -36,7 +38,6 @@
 }
 
 .quick-input-checkbox-list {
-	margin-left: 3px;
 	line-height: 22px;
 }
 
@@ -49,6 +50,7 @@
 	overflow: hidden;
 	display: flex;
 	height: 100%;
+	padding: 0 6px;
 }
 
 .quick-input-checkbox-list .quick-input-checkbox-list-label {
@@ -60,6 +62,7 @@
 
 .quick-input-checkbox-list .quick-input-checkbox-list-checkbox {
 	align-self: center;
+	margin: 0;
 	/* TODO */
 	/* margin-top: 5px; */
 }
@@ -71,7 +74,7 @@
 	flex-direction: column;
 	height: 100%;
 	flex: 1;
-	margin-left: 1px;
+	margin-left: 10px;
 }
 
 .quick-input-checkbox-list .quick-input-checkbox-list-rows > .quick-input-checkbox-list-row {
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index be6f2ff0d33..61e0e079014 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -37,6 +37,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	private layoutDimensions: Dimension;
 	private container: HTMLElement;
+	private selectAll: HTMLInputElement;
 	private inputBox: QuickInputBox;
 	private checkboxList: QuickInputCheckboxList;
 
@@ -63,6 +64,13 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		const headerContainer = dom.append(this.container, $('.quick-input-header'));
 
+		this.selectAll = <HTMLInputElement>dom.append(headerContainer, $('input.quick-input-select-all'));
+		this.selectAll.type = 'checkbox';
+		this.toUnbind.push(dom.addStandardDisposableListener(this.selectAll, dom.EventType.CHANGE, e => {
+			const checked = this.selectAll.checked;
+			this.checkboxList.setAllSelected(checked);
+		}));
+
 		this.inputBox = new QuickInputBox(headerContainer);
 		this.toUnbind.push(this.inputBox);
 		this.inputBox.style(this.themeService.getTheme());
@@ -97,6 +105,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
+		this.toUnbind.push(this.checkboxList.onSelectionChanged(() => {
+			this.selectAll.checked = this.checkboxList.getAllSelected();
+		}));
 
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
 			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
@@ -150,6 +161,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.inputBox.setPlaceholder(options.placeHolder ? localize('quickInput.ctrlSpaceToSelectWithPlaceholder', "{1} ({0} to toggle)", 'Ctrl+Space', options.placeHolder) : localize('quickInput.ctrlSpaceToSelect', "{0} to toggle", 'Ctrl+Space'));
 		// TODO: Progress indication.
 		this.checkboxList.setElements(await picks);
+		this.selectAll.checked = this.checkboxList.getAllSelected();
 
 		this.container.style.display = null;
 		this.updateLayout();
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 6d79389d10e..104d7be4bdb 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -15,7 +15,7 @@ import { IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { IMatch } from 'vs/base/common/filters';
 import { matchesFuzzyOcticonAware, parseOcticons } from 'vs/base/common/octicon';
 import { compareAnything } from 'vs/base/common/comparers';
-import { Emitter } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -103,7 +103,7 @@ class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedE
 	}
 
 	renderElement(element: SelectableElement, index: number, data: ISelectedElementTemplateData): void {
-		dispose(data.toDisposeElement);
+		data.toDisposeElement = dispose(data.toDisposeElement);
 		data.element = element;
 		data.checkbox.checked = element.selected;
 		data.toDisposeElement.push(element.onSelected(selected => data.checkbox.checked = selected));
@@ -122,7 +122,8 @@ class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedE
 	}
 
 	disposeTemplate(data: ISelectedElementTemplateData): void {
-		dispose(data.toDisposeTemplate);
+		data.toDisposeElement = dispose(data.toDisposeElement);
+		data.toDisposeTemplate = dispose(data.toDisposeTemplate);
 	}
 }
 
@@ -142,6 +143,9 @@ export class QuickInputCheckboxList {
 	private container: HTMLElement;
 	private list: WorkbenchList<SelectableElement>;
 	private elements: SelectableElement[] = [];
+	private _onSelectionChanged = new Emitter<IPickOpenEntry>();
+	onSelectionChanged: Event<IPickOpenEntry> = this._onSelectionChanged.event;
+	private elementDisposables: IDisposable[] = [];
 	private disposables: IDisposable[] = [];
 
 	constructor(
@@ -163,12 +167,24 @@ export class QuickInputCheckboxList {
 		}));
 	}
 
+	getAllSelected() {
+		return this.getSelectedElements().length === this.elements.length;
+	}
+
+	setAllSelected(select: boolean) {
+		this.elements.forEach(element => element.selected = select);
+	}
+
 	setElements(elements: IPickOpenEntry[]): void {
+		this.elementDisposables = dispose(this.elementDisposables);
 		this.elements = elements.map((item, index) => new SelectableElement({
 			index,
 			item,
 			selected: !!item.selected
 		}));
+		this.elementDisposables.push(...this.elements.map(element => element.onSelected(() => {
+			this._onSelectionChanged.fire(element.item);
+		})));
 		this.list.splice(0, this.list.length, this.elements);
 		this.list.setSelection([]);
 		this.list.focusFirst();
@@ -244,6 +260,7 @@ export class QuickInputCheckboxList {
 	}
 
 	dispose() {
+		this.elementDisposables = dispose(this.elementDisposables);
 		this.disposables = dispose(this.disposables);
 	}
 }

From e563e40ead747aa822ef43a58e5465355b802282 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Sat, 24 Mar 2018 18:36:01 +0100
Subject: [PATCH 036/383] API update (#45589)

---
 src/vs/platform/quickOpen/common/quickOpen.ts |  2 +-
 src/vs/vscode.d.ts                            | 52 ++++++++++++-------
 .../electron-browser/mainThreadQuickOpen.ts   |  2 +-
 src/vs/workbench/api/node/extHostQuickOpen.ts |  8 +--
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index eef2fa91bd5..f7d70839e80 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -89,7 +89,7 @@ export interface IPickOptions {
 	/**
 	 * an optional flag to make this picker multi-select (honoured by extension API)
 	 */
-	multiSelect?: boolean;
+	canSelectMany?: boolean;
 }
 
 export interface IInputOptions {
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 2295b78cdc1..93552cf0e67 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1528,6 +1528,14 @@ declare module 'vscode' {
 		 * A human readable string which is rendered less prominent.
 		 */
 		detail?: string;
+
+		/**
+		 * Optional flag indicating if this item is selected initially.
+		 * (Only honored when the picker allows multiple selections.)
+		 *
+		 * @see [QuickPickOptions.canSelectMany](#QuickPickOptions.canSelectMany)
+		 */
+		selected?: boolean;
 	}
 
 	/**
@@ -1555,9 +1563,9 @@ declare module 'vscode' {
 		ignoreFocusOut?: boolean;
 
 		/**
-		 * An optional flag to make the picker multi-select, if true the result is an array of picks.
+		 * An optional flag to make the picker accept multiple selections, if true the result is an array of picks.
 		 */
-		multiSelect?: boolean;
+		canSelectMany?: boolean;
 
 		/**
 		 * An optional function that is invoked whenever an item is selected.
@@ -1565,20 +1573,6 @@ declare module 'vscode' {
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}
 
-	/**
-	 * Represents an item that can be selected in a multi-select quick pick UI.
-	 */
-	export interface MultiSelectQuickPickItem extends QuickPickItem {
-		selected?: boolean;
-	}
-
-	/**
-	 * Options to configure the behavior of the multi-select quick pick UI. (Marker type.)
-	 */
-	export interface MultiSelectQuickPickOptions extends QuickPickOptions {
-		multiSelect: true;
-	}
-
 	/**
 	 * Options to configure the behaviour of the [workspace folder](#WorkspaceFolder) pick UI.
 	 */
@@ -5080,26 +5074,44 @@ declare module 'vscode' {
 		 */
 		export function showErrorMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of strings, or a promise that resolves to an array of strings.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick(items: string[] | Thenable<string[]>, options: QuickPickOptions & { canSelectMany: true; }, token?: CancellationToken): Thenable<string[] | undefined>;
+
 		/**
 		 * Shows a selection list.
 		 *
 		 * @param items An array of strings, or a promise that resolves to an array of strings.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected item(s) or `undefined`.
+		 * @return A promise that resolves to the selection or `undefined`.
 		 */
-		export function showQuickPick(items: string[] | Thenable<string[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<string[] | undefined>;
 		export function showQuickPick(items: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of items, or a promise that resolves to an array of items.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options: QuickPickOptions & { canSelectMany: true; }, token?: CancellationToken): Thenable<T[] | undefined>;
+
 		/**
 		 * Shows a selection list.
 		 *
 		 * @param items An array of items, or a promise that resolves to an array of items.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected item(s) or `undefined`.
+		 * @return A promise that resolves to the selected item or `undefined`.
 		 */
-		export function showQuickPick<T extends MultiSelectQuickPickItem>(items: T[] | Thenable<T[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<T[] | undefined>;
 		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
 
 		/**
diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index c2e42dc13b6..a3b4d16d8b5 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -55,7 +55,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 		});
 
 		return asWinJsPromise<number | number[]>(token => {
-			if (options.multiSelect) {
+			if (options.canSelectMany) {
 				return this._quickInputService.pick(this._contents, options, token)
 					.then(items => {
 						if (items) {
diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts
index b95da3ae7b2..832853988d2 100644
--- a/src/vs/workbench/api/node/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/node/extHostQuickOpen.ts
@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { wireCancellationToken, asWinJsPromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { QuickPickOptions, QuickPickItem, InputBoxOptions, WorkspaceFolderPickOptions, WorkspaceFolder, MultiSelectQuickPickItem, MultiSelectQuickPickOptions } from 'vscode';
+import { QuickPickOptions, QuickPickItem, InputBoxOptions, WorkspaceFolderPickOptions, WorkspaceFolder } from 'vscode';
 import { MainContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, IMainContext } from './extHost.protocol';
 import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
@@ -29,7 +29,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 		this._commands = commands;
 	}
 
-	showQuickPick(itemsOrItemsPromise: MultiSelectQuickPickItem[] | Thenable<MultiSelectQuickPickItem[]>, options: MultiSelectQuickPickOptions, token?: CancellationToken): Thenable<MultiSelectQuickPickItem[] | undefined>;
+	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options: QuickPickOptions & { canSelectMany: true; }, token?: CancellationToken): Thenable<QuickPickItem[] | undefined>;
 	showQuickPick(itemsOrItemsPromise: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<QuickPickItem | undefined>;
 	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | Item[] | undefined> {
@@ -45,7 +45,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 			matchOnDescription: options && options.matchOnDescription,
 			matchOnDetail: options && options.matchOnDetail,
 			ignoreFocusLost: options && options.ignoreFocusOut,
-			multiSelect: options && options.multiSelect
+			canSelectMany: options && options.canSelectMany
 		});
 
 		const promise = TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
@@ -70,7 +70,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 						label = item.label;
 						description = item.description;
 						detail = item.detail;
-						selected = options && options.multiSelect ? (<MultiSelectQuickPickItem>item).selected : undefined;
+						selected = item.selected;
 					}
 					pickItems.push({
 						label,

From 61e1f7f72b1973ad511cfe705771fc02f1b1de59 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Sat, 24 Mar 2018 18:36:34 +0100
Subject: [PATCH 037/383] Toggle only visible items (#45589)

---
 .../browser/parts/quickinput/quickInput.ts       |  2 +-
 .../parts/quickinput/quickInputCheckboxList.ts   | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 61e0e079014..31eccdebaab 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -105,7 +105,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
-		this.toUnbind.push(this.checkboxList.onSelectionChanged(() => {
+		this.toUnbind.push(this.checkboxList.onAllSelectedChanged(() => {
 			this.selectAll.checked = this.checkboxList.getAllSelected();
 		}));
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 104d7be4bdb..381cff242d1 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -143,8 +143,8 @@ export class QuickInputCheckboxList {
 	private container: HTMLElement;
 	private list: WorkbenchList<SelectableElement>;
 	private elements: SelectableElement[] = [];
-	private _onSelectionChanged = new Emitter<IPickOpenEntry>();
-	onSelectionChanged: Event<IPickOpenEntry> = this._onSelectionChanged.event;
+	private _onAllSelectedChanged = new Emitter<boolean>(); // TODO: Debounce
+	onAllSelectedChanged: Event<boolean> = this._onAllSelectedChanged.event;
 	private elementDisposables: IDisposable[] = [];
 	private disposables: IDisposable[] = [];
 
@@ -168,11 +168,15 @@ export class QuickInputCheckboxList {
 	}
 
 	getAllSelected() {
-		return this.getSelectedElements().length === this.elements.length;
+		return !this.elements.some(element => !element.hidden && !element.selected);
 	}
 
 	setAllSelected(select: boolean) {
-		this.elements.forEach(element => element.selected = select);
+		this.elements.forEach(element => {
+			if (!element.hidden) {
+				element.selected = select;
+			}
+		});
 	}
 
 	setElements(elements: IPickOpenEntry[]): void {
@@ -183,7 +187,7 @@ export class QuickInputCheckboxList {
 			selected: !!item.selected
 		}));
 		this.elementDisposables.push(...this.elements.map(element => element.onSelected(() => {
-			this._onSelectionChanged.fire(element.item);
+			this._onAllSelectedChanged.fire(this.getAllSelected());
 		})));
 		this.list.splice(0, this.list.length, this.elements);
 		this.list.setSelection([]);
@@ -250,6 +254,8 @@ export class QuickInputCheckboxList {
 		this.list.setSelection([]);
 		this.list.focusFirst();
 		this.list.layout();
+
+		this._onAllSelectedChanged.fire(this.getAllSelected());
 	}
 
 	toggleCheckbox() {

From 3f0f7c00935dce116f9162136b1084458d5e23f2 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 09:22:14 +0200
Subject: [PATCH 038/383] Count badge (#45589)

---
 .../browser/parts/quickinput/quickInput.css   |  9 +++++++++
 .../browser/parts/quickinput/quickInput.ts    | 19 +++++++++++++++----
 .../quickinput/quickInputCheckboxList.ts      | 19 +++++++++++++------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 311de5fd355..f96cad54511 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -27,6 +27,15 @@
 	margin-left: 5px;
 }
 
+.quick-input-count {
+	align-self: center;
+	margin-left: 5px;
+}
+
+.quick-input-count .monaco-count-badge {
+	vertical-align: middle;
+}
+
 .quick-input-action {
 	margin-left: 6px;
 	border: 0;
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 31eccdebaab..0bf7fe80db0 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -25,6 +25,8 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
+import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
+import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 
 const $ = dom.$;
 
@@ -39,6 +41,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private container: HTMLElement;
 	private selectAll: HTMLInputElement;
 	private inputBox: QuickInputBox;
+	private count: CountBadge;
 	private checkboxList: QuickInputCheckboxList;
 
 	private resolve: (value?: object[] | Thenable<object[]>) => void;
@@ -68,7 +71,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.selectAll.type = 'checkbox';
 		this.toUnbind.push(dom.addStandardDisposableListener(this.selectAll, dom.EventType.CHANGE, e => {
 			const checked = this.selectAll.checked;
-			this.checkboxList.setAllSelected(checked);
+			this.checkboxList.setAllVisibleSelected(checked);
 		}));
 
 		this.inputBox = new QuickInputBox(headerContainer);
@@ -103,10 +106,17 @@ export class QuickInputService extends Component implements IQuickInputService {
 		ok.textContent = localize('ok', "OK");
 		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(true)));
 
+		const badgeContainer = dom.append(headerContainer, $('.quick-input-count'));
+		this.count = new CountBadge(badgeContainer);
+		this.toUnbind.push(attachBadgeStyler(this.count, this.themeService));
+
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
-		this.toUnbind.push(this.checkboxList.onAllSelectedChanged(() => {
-			this.selectAll.checked = this.checkboxList.getAllSelected();
+		this.toUnbind.push(this.checkboxList.onAllVisibleSelectedChanged(allSelected => {
+			this.selectAll.checked = allSelected;
+		}));
+		this.toUnbind.push(this.checkboxList.onSelectedCountChanged(count => {
+			this.count.setCount(count);
 		}));
 
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
@@ -161,7 +171,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.inputBox.setPlaceholder(options.placeHolder ? localize('quickInput.ctrlSpaceToSelectWithPlaceholder', "{1} ({0} to toggle)", 'Ctrl+Space', options.placeHolder) : localize('quickInput.ctrlSpaceToSelect', "{0} to toggle", 'Ctrl+Space'));
 		// TODO: Progress indication.
 		this.checkboxList.setElements(await picks);
-		this.selectAll.checked = this.checkboxList.getAllSelected();
+		this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
+		this.count.setCount(this.checkboxList.getSelectedCount());
 
 		this.container.style.display = null;
 		this.updateLayout();
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 381cff242d1..a90a82d2547 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -143,8 +143,10 @@ export class QuickInputCheckboxList {
 	private container: HTMLElement;
 	private list: WorkbenchList<SelectableElement>;
 	private elements: SelectableElement[] = [];
-	private _onAllSelectedChanged = new Emitter<boolean>(); // TODO: Debounce
-	onAllSelectedChanged: Event<boolean> = this._onAllSelectedChanged.event;
+	private _onAllVisibleSelectedChanged = new Emitter<boolean>(); // TODO: Debounce
+	onAllVisibleSelectedChanged: Event<boolean> = this._onAllVisibleSelectedChanged.event;
+	private _onSelectedCountChanged = new Emitter<number>(); // TODO: Debounce
+	onSelectedCountChanged: Event<number> = this._onSelectedCountChanged.event;
 	private elementDisposables: IDisposable[] = [];
 	private disposables: IDisposable[] = [];
 
@@ -167,11 +169,15 @@ export class QuickInputCheckboxList {
 		}));
 	}
 
-	getAllSelected() {
+	getAllVisibleSelected() {
 		return !this.elements.some(element => !element.hidden && !element.selected);
 	}
 
-	setAllSelected(select: boolean) {
+	getSelectedCount() {
+		return this.getSelectedElements().length;
+	}
+
+	setAllVisibleSelected(select: boolean) {
 		this.elements.forEach(element => {
 			if (!element.hidden) {
 				element.selected = select;
@@ -187,7 +193,8 @@ export class QuickInputCheckboxList {
 			selected: !!item.selected
 		}));
 		this.elementDisposables.push(...this.elements.map(element => element.onSelected(() => {
-			this._onAllSelectedChanged.fire(this.getAllSelected());
+			this._onAllVisibleSelectedChanged.fire(this.getAllVisibleSelected());
+			this._onSelectedCountChanged.fire(this.getSelectedCount());
 		})));
 		this.list.splice(0, this.list.length, this.elements);
 		this.list.setSelection([]);
@@ -255,7 +262,7 @@ export class QuickInputCheckboxList {
 		this.list.focusFirst();
 		this.list.layout();
 
-		this._onAllSelectedChanged.fire(this.getAllSelected());
+		this._onAllVisibleSelectedChanged.fire(this.getAllVisibleSelected());
 	}
 
 	toggleCheckbox() {

From 0cea18743baf022df2af1728ff10c7169dc4f0d7 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 11:14:11 +0200
Subject: [PATCH 039/383] matchOnDescription, matchOnDetail, ignoreFocusLost
 options (#45589)

---
 .../workbench/browser/parts/quickinput/quickInput.ts   | 10 ++++++++--
 .../browser/parts/quickinput/quickInputCheckboxList.ts |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 0bf7fe80db0..959fb33bf2c 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -27,6 +27,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 const $ = dom.$;
 
@@ -43,10 +44,12 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private inputBox: QuickInputBox;
 	private count: CountBadge;
 	private checkboxList: QuickInputCheckboxList;
+	private ignoreFocusLost = false;
 
 	private resolve: (value?: object[] | Thenable<object[]>) => void;
 
 	constructor(
+		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPartService private partService: IPartService,
@@ -125,7 +128,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 					return;
 				}
 			}
-			if (this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
+			if (!this.ignoreFocusLost && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
 				this.close(false);
 			}
 		}));
@@ -157,7 +160,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.container.style.display = 'none';
 	}
 
-	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]> {
+	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options: IPickOptions = {}, token?: CancellationToken): TPromise<T[]> {
 		this.create();
 		this.quickOpenService.close();
 		if (this.resolve) {
@@ -171,8 +174,11 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.inputBox.setPlaceholder(options.placeHolder ? localize('quickInput.ctrlSpaceToSelectWithPlaceholder', "{1} ({0} to toggle)", 'Ctrl+Space', options.placeHolder) : localize('quickInput.ctrlSpaceToSelect', "{0} to toggle", 'Ctrl+Space'));
 		// TODO: Progress indication.
 		this.checkboxList.setElements(await picks);
+		this.checkboxList.matchOnDescription = options.matchOnDescription;
+		this.checkboxList.matchOnDetail = options.matchOnDetail;
 		this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
 		this.count.setCount(this.checkboxList.getSelectedCount());
+		this.ignoreFocusLost = options.ignoreFocusLost;
 
 		this.container.style.display = null;
 		this.updateLayout();
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index a90a82d2547..d33c2e7e0f6 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -143,6 +143,8 @@ export class QuickInputCheckboxList {
 	private container: HTMLElement;
 	private list: WorkbenchList<SelectableElement>;
 	private elements: SelectableElement[] = [];
+	matchOnDescription = false;
+	matchOnDetail = false;
 	private _onAllVisibleSelectedChanged = new Emitter<boolean>(); // TODO: Debounce
 	onAllVisibleSelectedChanged: Event<boolean> = this._onAllVisibleSelectedChanged.event;
 	private _onSelectedCountChanged = new Emitter<number>(); // TODO: Debounce
@@ -231,8 +233,8 @@ export class QuickInputCheckboxList {
 		else {
 			this.elements.forEach(element => {
 				const labelHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.label));
-				const descriptionHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.description || ''));
-				const detailHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.detail || ''));
+				const descriptionHighlights = this.matchOnDescription ? matchesFuzzyOcticonAware(query, parseOcticons(element.item.description || '')) : undefined;
+				const detailHighlights = this.matchOnDetail ? matchesFuzzyOcticonAware(query, parseOcticons(element.item.detail || '')) : undefined;
 
 				if (element.shouldAlwaysShow || labelHighlights || descriptionHighlights || detailHighlights) {
 					element.labelHighlights = labelHighlights;

From 14fc1c5459349b169a9db60e19c64774848b31ec Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 11:41:59 +0200
Subject: [PATCH 040/383] Move badge inside filter field (#45589)

---
 src/vs/base/browser/ui/countBadge/countBadge.ts      | 10 +++++++++-
 .../browser/parts/quickinput/quickInput.css          |  9 ++++++++-
 .../workbench/browser/parts/quickinput/quickInput.ts | 12 +++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/vs/base/browser/ui/countBadge/countBadge.ts b/src/vs/base/browser/ui/countBadge/countBadge.ts
index 8ff58693925..6eb64da57bd 100644
--- a/src/vs/base/browser/ui/countBadge/countBadge.ts
+++ b/src/vs/base/browser/ui/countBadge/countBadge.ts
@@ -13,6 +13,7 @@ import { mixin } from 'vs/base/common/objects';
 
 export interface ICountBadgeOptions extends ICountBadgetyles {
 	count?: number;
+	countFormat?: string;
 	titleFormat?: string;
 }
 
@@ -31,6 +32,7 @@ export class CountBadge {
 
 	private element: HTMLElement;
 	private count: number;
+	private countFormat: string;
 	private titleFormat: string;
 
 	private badgeBackground: Color;
@@ -48,6 +50,7 @@ export class CountBadge {
 		this.badgeBorder = this.options.badgeBorder;
 
 		this.element = append(container, $('.monaco-count-badge'));
+		this.countFormat = this.options.countFormat || '{0}';
 		this.titleFormat = this.options.titleFormat || '';
 		this.setCount(this.options.count || 0);
 	}
@@ -57,13 +60,18 @@ export class CountBadge {
 		this.render();
 	}
 
+	setCountFormat(countFormat: string) {
+		this.countFormat = countFormat;
+		this.render();
+	}
+
 	setTitleFormat(titleFormat: string) {
 		this.titleFormat = titleFormat;
 		this.render();
 	}
 
 	private render() {
-		this.element.textContent = '' + this.count;
+		this.element.textContent = format(this.countFormat, this.count);
 		this.element.title = format(this.titleFormat, this.count);
 
 		this.applyStyles();
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index f96cad54511..962edb6cb12 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -22,6 +22,12 @@
 	margin: 0;
 }
 
+.quick-input-filter {
+	flex-grow: 1;
+	display: flex;
+	position: relative;
+}
+
 .quick-input-box {
 	flex-grow: 1;
 	margin-left: 5px;
@@ -29,7 +35,8 @@
 
 .quick-input-count {
 	align-self: center;
-	margin-left: 5px;
+	position: absolute;
+	right: 4px;
 }
 
 .quick-input-count .monaco-count-badge {
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 959fb33bf2c..b130c340b36 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -77,7 +77,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 			this.checkboxList.setAllVisibleSelected(checked);
 		}));
 
-		this.inputBox = new QuickInputBox(headerContainer);
+		const filterContainer = dom.append(headerContainer, $('.quick-input-filter'));
+
+		this.inputBox = new QuickInputBox(filterContainer);
 		this.toUnbind.push(this.inputBox);
 		this.inputBox.style(this.themeService.getTheme());
 		this.inputBox.onDidChange(value => {
@@ -105,14 +107,14 @@ export class QuickInputService extends Component implements IQuickInputService {
 			}
 		}));
 
+		const badgeContainer = dom.append(filterContainer, $('.quick-input-count'));
+		this.count = new CountBadge(badgeContainer, { countFormat: localize('quickInput.countSelected', "{0} Selected") });
+		this.toUnbind.push(attachBadgeStyler(this.count, this.themeService));
+
 		const ok = dom.append(headerContainer, $('button.quick-input-action'));
 		ok.textContent = localize('ok', "OK");
 		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(true)));
 
-		const badgeContainer = dom.append(headerContainer, $('.quick-input-count'));
-		this.count = new CountBadge(badgeContainer);
-		this.toUnbind.push(attachBadgeStyler(this.count, this.themeService));
-
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
 		this.toUnbind.push(this.checkboxList.onAllVisibleSelectedChanged(allSelected => {

From fa155b782696c4d36eb2cdc10a36a1f29435f22d Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 12:13:37 +0200
Subject: [PATCH 041/383] Transfer focus to list on arrow-down (#45589)

---
 .../browser/parts/quickinput/quickInput.ts    | 24 +++++++------------
 .../quickinput/quickInputCheckboxList.ts      | 18 ++++++++++++--
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index b130c340b36..bcc80f2079c 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -88,21 +88,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.toUnbind.push(this.inputBox.onKeyDown(event => {
 			switch (event.keyCode) {
 				case KeyCode.DownArrow:
-					this.checkboxList.focus('Next');
-					break;
-				case KeyCode.UpArrow:
-					this.checkboxList.focus('Previous');
-					break;
-				case KeyCode.PageDown:
-					this.checkboxList.focus('NextPage');
-					break;
-				case KeyCode.PageUp:
-					this.checkboxList.focus('PreviousPage');
-					break;
-				case KeyCode.Space:
-					if (event.ctrlKey) {
-						this.checkboxList.toggleCheckbox();
-					}
+					this.checkboxList.domFocus();
 					break;
 			}
 		}));
@@ -123,6 +109,12 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.toUnbind.push(this.checkboxList.onSelectedCountChanged(count => {
 			this.count.setCount(count);
 		}));
+		this.toUnbind.push(this.checkboxList.onLeave(() => {
+			// Defer to avoid the input field reacting to the triggering key.
+			setTimeout(() => {
+				this.inputBox.setFocus();
+			}, 0);
+		}));
 
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
 			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
@@ -173,7 +165,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.inputBox.setValue('');
 		// TODO: Localize shortcut.
-		this.inputBox.setPlaceholder(options.placeHolder ? localize('quickInput.ctrlSpaceToSelectWithPlaceholder', "{1} ({0} to toggle)", 'Ctrl+Space', options.placeHolder) : localize('quickInput.ctrlSpaceToSelect', "{0} to toggle", 'Ctrl+Space'));
+		this.inputBox.setPlaceholder(options.placeHolder || '');
 		// TODO: Progress indication.
 		this.checkboxList.setElements(await picks);
 		this.checkboxList.matchOnDescription = options.matchOnDescription;
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index d33c2e7e0f6..801d46c0a9d 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -149,6 +149,8 @@ export class QuickInputCheckboxList {
 	onAllVisibleSelectedChanged: Event<boolean> = this._onAllVisibleSelectedChanged.event;
 	private _onSelectedCountChanged = new Emitter<number>(); // TODO: Debounce
 	onSelectedCountChanged: Event<number> = this._onSelectedCountChanged.event;
+	private _onLeave = new Emitter<void>();
+	onLeave: Event<void> = this._onLeave.event;
 	private elementDisposables: IDisposable[] = [];
 	private disposables: IDisposable[] = [];
 
@@ -165,8 +167,16 @@ export class QuickInputCheckboxList {
 		this.disposables.push(this.list);
 		this.disposables.push(this.list.onKeyDown(e => {
 			const event = new StandardKeyboardEvent(e);
-			if (event.keyCode === KeyCode.Space) {
-				this.toggleCheckbox();
+			switch (event.keyCode) {
+				case KeyCode.Space:
+					this.toggleCheckbox();
+					break;
+				case KeyCode.UpArrow:
+					const focus = this.list.getFocus();
+					if (focus.length === 1 && focus[0] === 0) {
+						this._onLeave.fire();
+					}
+					break;
 			}
 		}));
 	}
@@ -212,6 +222,10 @@ export class QuickInputCheckboxList {
 		this.list['focus' + what]();
 	}
 
+	domFocus() {
+		this.list.domFocus();
+	}
+
 	layout(): void {
 		this.list.layout();
 	}

From addd944efad9753b30b0dffa0b0d4660403bb27f Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 12:31:43 +0200
Subject: [PATCH 042/383] Not implementing onDidSelectItem for now. (#45589)

---
 src/vs/vscode.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 93552cf0e67..86d1c7a2289 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1569,6 +1569,7 @@ declare module 'vscode' {
 
 		/**
 		 * An optional function that is invoked whenever an item is selected.
+		 * (Only honored when the picker does not allow multiple selections.)
 		 */
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}

From cad452376399db3d00ac44d57ab51cf57b9fe080 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 15:19:03 +0200
Subject: [PATCH 043/383] Subscribe to cancellation token (#45589)

---
 .../browser/parts/quickinput/quickInput.ts    | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index bcc80f2079c..bdee718a01d 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -46,7 +46,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private checkboxList: QuickInputCheckboxList;
 	private ignoreFocusLost = false;
 
-	private resolve: (value?: object[] | Thenable<object[]>) => void;
+	private resolve: (value?: IPickOpenEntry[] | Thenable<IPickOpenEntry[]>) => void;
 
 	constructor(
 		@IEnvironmentService private environmentService: IEnvironmentService,
@@ -99,7 +99,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		const ok = dom.append(headerContainer, $('button.quick-input-action'));
 		ok.textContent = localize('ok', "OK");
-		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(true)));
+		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(this.checkboxList.getSelectedElements())));
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
@@ -123,7 +123,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 				}
 			}
 			if (!this.ignoreFocusLost && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
-				this.close(false);
+				this.close();
 			}
 		}));
 		this.toUnbind.push(dom.addDisposableListener(this.container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
@@ -131,54 +131,59 @@ export class QuickInputService extends Component implements IQuickInputService {
 			switch (event.keyCode) {
 				case KeyCode.Enter:
 					dom.EventHelper.stop(e, true);
-					this.close(true);
+					this.close(this.checkboxList.getSelectedElements());
 					break;
 				case KeyCode.Escape:
 					dom.EventHelper.stop(e, true);
-					this.close(false);
+					this.close();
 					break;
 			}
 		}));
 
-		this.toUnbind.push(this.quickOpenService.onShow(() => this.close(false)));
+		this.toUnbind.push(this.quickOpenService.onShow(() => this.close()));
 	}
 
-	private close(ok: boolean) {
+	private close(value?: IPickOpenEntry[] | Thenable<IPickOpenEntry[]>) {
 		if (this.resolve) {
-			if (ok) {
-				this.resolve(this.checkboxList.getSelectedElements());
-			} else {
-				this.resolve();
-			}
+			this.resolve(value);
 		}
 		this.container.style.display = 'none';
 	}
 
-	async pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options: IPickOptions = {}, token?: CancellationToken): TPromise<T[]> {
+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options: IPickOptions = {}, token: CancellationToken = CancellationToken.None): TPromise<T[]> {
 		this.create();
 		this.quickOpenService.close();
 		if (this.resolve) {
 			this.resolve();
 		}
 
-		// TODO: Listen on cancellation token.
-
 		this.inputBox.setValue('');
-		// TODO: Localize shortcut.
 		this.inputBox.setPlaceholder(options.placeHolder || '');
-		// TODO: Progress indication.
-		this.checkboxList.setElements(await picks);
 		this.checkboxList.matchOnDescription = options.matchOnDescription;
 		this.checkboxList.matchOnDetail = options.matchOnDetail;
+		this.ignoreFocusLost = options.ignoreFocusLost;
+
+		this.checkboxList.setElements([]);
 		this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
 		this.count.setCount(this.checkboxList.getSelectedCount());
-		this.ignoreFocusLost = options.ignoreFocusLost;
 
 		this.container.style.display = null;
 		this.updateLayout();
 		this.inputBox.setFocus();
 
-		return new TPromise<T[]>(resolve => this.resolve = resolve);
+		const result = new TPromise<T[]>(resolve => this.resolve = resolve);
+		const d = token.onCancellationRequested(() => this.close());
+		result.then(() => d.dispose(), () => d.dispose());
+
+		// TODO: Progress indication.
+		picks.then(elements => {
+			this.checkboxList.setElements(elements);
+			this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
+			this.count.setCount(this.checkboxList.getSelectedCount());
+			this.updateLayout();
+		}).then(null, reason => this.close(TPromise.wrapError(reason)));
+
+		return result;
 	}
 
 	public layout(dimension: Dimension): void {

From f5a2f271811527f88da7faea513e4b15d219c4cb Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 16:38:55 +0200
Subject: [PATCH 044/383] Progress bar (#45589)

---
 .../browser/parts/quickinput/quickInput.css   |  7 +++-
 .../browser/parts/quickinput/quickInput.ts    | 38 ++++++++++++++++---
 .../browser/parts/quickinput/quickInputBox.ts |  6 ++-
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 962edb6cb12..46158914cf0 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -14,7 +14,7 @@
 
 .quick-input-header {
 	display: flex;
-	padding: 6px;
+	padding: 6px 6px 4px 6px;
 }
 
 .quick-input-select-all {
@@ -53,6 +53,11 @@
 	outline:0;
 }
 
+.quick-input-progress.monaco-progress-container,
+.quick-input-progress.monaco-progress-container .progress-bit {
+	height: 2px;
+}
+
 .quick-input-checkbox-list {
 	line-height: 22px;
 }
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index bdee718a01d..61c956997ea 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -28,6 +28,7 @@ import { CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 
 const $ = dom.$;
 
@@ -43,6 +44,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private selectAll: HTMLInputElement;
 	private inputBox: QuickInputBox;
 	private count: CountBadge;
+	private ready = false;
+	private progressBar: ProgressBar;
 	private checkboxList: QuickInputCheckboxList;
 	private ignoreFocusLost = false;
 
@@ -99,7 +102,14 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		const ok = dom.append(headerContainer, $('button.quick-input-action'));
 		ok.textContent = localize('ok', "OK");
-		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => this.close(this.checkboxList.getSelectedElements())));
+		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => {
+			if (this.ready) {
+				this.close(this.checkboxList.getSelectedElements());
+			}
+		}));
+
+		this.progressBar = new ProgressBar(this.container); // TODO theme
+		this.progressBar.getContainer().addClass('quick-input-progress');
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
@@ -130,8 +140,10 @@ export class QuickInputService extends Component implements IQuickInputService {
 			const event = new StandardKeyboardEvent(e);
 			switch (event.keyCode) {
 				case KeyCode.Enter:
-					dom.EventHelper.stop(e, true);
-					this.close(this.checkboxList.getSelectedElements());
+					if (this.ready) {
+						dom.EventHelper.stop(e, true);
+						this.close(this.checkboxList.getSelectedElements());
+					}
 					break;
 				case KeyCode.Escape:
 					dom.EventHelper.stop(e, true);
@@ -157,12 +169,15 @@ export class QuickInputService extends Component implements IQuickInputService {
 			this.resolve();
 		}
 
-		this.inputBox.setValue('');
+		this.inputBox.value = '';
 		this.inputBox.setPlaceholder(options.placeHolder || '');
 		this.checkboxList.matchOnDescription = options.matchOnDescription;
 		this.checkboxList.matchOnDetail = options.matchOnDetail;
 		this.ignoreFocusLost = options.ignoreFocusLost;
 
+		this.progressBar.stop();
+		this.ready = false;
+
 		this.checkboxList.setElements([]);
 		this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
 		this.count.setCount(this.checkboxList.getSelectedCount());
@@ -175,11 +190,24 @@ export class QuickInputService extends Component implements IQuickInputService {
 		const d = token.onCancellationRequested(() => this.close());
 		result.then(() => d.dispose(), () => d.dispose());
 
-		// TODO: Progress indication.
+		const delay = TPromise.timeout(800);
+		delay.then(() => this.progressBar.infinite(), () => { /* ignore */ });
+
+		const wasResolve = this.resolve;
 		picks.then(elements => {
+			delay.cancel();
+			if (this.resolve !== wasResolve) {
+				return;
+			}
+
+			this.progressBar.stop();
+			this.ready = true;
+
 			this.checkboxList.setElements(elements);
+			this.checkboxList.filter(this.inputBox.value);
 			this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
 			this.count.setCount(this.checkboxList.getSelectedCount());
+
 			this.updateLayout();
 		}).then(null, reason => this.close(TPromise.wrapError(reason)));
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
index af3f90784a8..0acd72de5f9 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -50,7 +50,11 @@ export class QuickInputBox {
 		return this.inputBox.onDidChange(handler);
 	}
 
-	setValue(value: string) {
+	get value() {
+		return this.inputBox.value;
+	}
+
+	set value(value: string) {
 		this.inputBox.value = value;
 	}
 

From 1c0aa2e870fcc08c747d9bd5b4fbe65ad4ae79e1 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 16:46:03 +0200
Subject: [PATCH 045/383] Progress bar theme color (#45589)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 61c956997ea..457cd6e1dc0 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -26,7 +26,7 @@ import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
+import { attachBadgeStyler, attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 
@@ -108,8 +108,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 			}
 		}));
 
-		this.progressBar = new ProgressBar(this.container); // TODO theme
+		this.progressBar = new ProgressBar(this.container);
 		this.progressBar.getContainer().addClass('quick-input-progress');
+		this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);

From ecce88d77484e8630b3df31b8aeac62f8b5d7112 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 26 Mar 2018 22:23:09 +0200
Subject: [PATCH 046/383] onDidSelectItem (#45589)

---
 src/vs/vscode.d.ts                            |  1 -
 .../electron-browser/mainThreadQuickOpen.ts   | 46 +++++++++----------
 .../browser/parts/quickinput/quickInput.ts    | 11 ++++-
 .../quickinput/quickInputCheckboxList.ts      |  6 ++-
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 86d1c7a2289..93552cf0e67 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1569,7 +1569,6 @@ declare module 'vscode' {
 
 		/**
 		 * An optional function that is invoked whenever an item is selected.
-		 * (Only honored when the picker does not allow multiple selections.)
 		 */
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index a3b4d16d8b5..c84d6a8e5f3 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -54,29 +54,29 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			};
 		});
 
-		return asWinJsPromise<number | number[]>(token => {
-			if (options.canSelectMany) {
-				return this._quickInputService.pick(this._contents, options, token)
-					.then(items => {
-						if (items) {
-							return items.map(item => item.handle);
-						}
-						return undefined;
-					});
-			} else {
-				return this._quickOpenService.pick(this._contents, options, token)
-					.then(item => {
-						if (item) {
-							return item.handle;
-						}
-						return undefined;
-					});
-			}
-		}).then(undefined, undefined, progress => {
-			if (progress) {
-				this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
-			}
-		});
+		if (options.canSelectMany) {
+			return asWinJsPromise(token => this._quickInputService.pick(this._contents, options, token)).then(items => {
+				if (items) {
+					return items.map(item => item.handle);
+				}
+				return undefined;
+			}, undefined, progress => {
+				if (progress) {
+					this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
+				}
+			});
+		} else {
+			return asWinJsPromise(token => this._quickOpenService.pick(this._contents, options, token)).then(item => {
+				if (item) {
+					return item.handle;
+				}
+				return undefined;
+			}, undefined, progress => {
+				if (progress) {
+					this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
+				}
+			});
+		}
 	}
 
 	$setItems(items: MyQuickPickItems[]): TPromise<any> {
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 457cd6e1dc0..03ded3fde53 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -50,6 +50,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private ignoreFocusLost = false;
 
 	private resolve: (value?: IPickOpenEntry[] | Thenable<IPickOpenEntry[]>) => void;
+	private progress: (value: IPickOpenEntry) => void;
 
 	constructor(
 		@IEnvironmentService private environmentService: IEnvironmentService,
@@ -126,6 +127,11 @@ export class QuickInputService extends Component implements IQuickInputService {
 				this.inputBox.setFocus();
 			}, 0);
 		}));
+		this.toUnbind.push(this.checkboxList.onFocusChange(e => {
+			if (this.progress && e.length) {
+				this.progress(e[0]);
+			}
+		}));
 
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
 			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
@@ -187,7 +193,10 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.updateLayout();
 		this.inputBox.setFocus();
 
-		const result = new TPromise<T[]>(resolve => this.resolve = resolve);
+		const result = new TPromise<T[]>((resolve, reject, progress) => {
+			this.resolve = resolve;
+			this.progress = progress;
+		});
 		const d = token.onCancellationRequested(() => this.close());
 		result.then(() => d.dispose(), () => d.dispose());
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 801d46c0a9d..a4328d29cf0 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -15,7 +15,7 @@ import { IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { IMatch } from 'vs/base/common/filters';
 import { matchesFuzzyOcticonAware, parseOcticons } from 'vs/base/common/octicon';
 import { compareAnything } from 'vs/base/common/comparers';
-import { Emitter, Event } from 'vs/base/common/event';
+import { Emitter, Event, mapEvent } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -181,6 +181,10 @@ export class QuickInputCheckboxList {
 		}));
 	}
 
+	get onFocusChange() {
+		return mapEvent(this.list.onFocusChange, e => e.elements.map(e => e.item));
+	}
+
 	getAllVisibleSelected() {
 		return !this.elements.some(element => !element.hidden && !element.selected);
 	}

From 7a3204ce57da60afba584629a801c897608329e1 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 26 Mar 2018 22:58:27 +0200
Subject: [PATCH 047/383] Fixes #41968: Keep the top line stable, and not the
 centered one

---
 .../contrib/codelens/codelensController.ts       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
index f3e26373bc6..980b6a07bd3 100644
--- a/src/vs/editor/contrib/codelens/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -218,8 +218,14 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 			}
 		}
 
-		const centeredRange = this._editor.getCenteredRangeInViewport();
-		const shouldRestoreCenteredRange = centeredRange && (groups.length !== this._lenses.length && this._editor.getScrollTop() !== 0);
+		const visibleRanges = this._editor.getVisibleRanges();
+		const visiblePosition = (visibleRanges.length > 0 ? visibleRanges[0].getStartPosition() : null);
+		let visiblePositionScrollDelta = 0;
+		if (visiblePosition) {
+			const visiblePositionScrollTop = this._editor.getTopForPosition(visiblePosition.lineNumber, visiblePosition.column);
+			visiblePositionScrollDelta = this._editor.getScrollTop() - visiblePositionScrollTop;
+		}
+
 		this._editor.changeDecorations((changeAccessor) => {
 			this._editor.changeViewZones((accessor) => {
 
@@ -259,8 +265,10 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 				helper.commit(changeAccessor);
 			});
 		});
-		if (shouldRestoreCenteredRange) {
-			this._editor.revealRangeInCenter(centeredRange, editorCommon.ScrollType.Immediate);
+
+		if (visiblePosition) {
+			const visiblePositionScrollTop = this._editor.getTopForPosition(visiblePosition.lineNumber, visiblePosition.column);
+			this._editor.setScrollTop(visiblePositionScrollTop + visiblePositionScrollDelta);
 		}
 	}
 

From 9d95fbae989ee0d78dd476df3e0ada5aa27a58ab Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 26 Mar 2018 14:19:02 -0700
Subject: [PATCH 048/383] Use latest emmet helper to fix #46305

---
 extensions/emmet/package.json                         | 2 +-
 extensions/emmet/yarn.lock                            | 6 +++---
 extensions/html-language-features/server/package.json | 2 +-
 extensions/html-language-features/server/yarn.lock    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 7bf52dce604..c3b37bde1fd 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -439,7 +439,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.2.2",
+        "vscode-emmet-helper": "^1.2.3",
         "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
         "vscode-nls": "3.2.1"
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index c3bc0c344cf..15529b91be6 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2052,9 +2052,9 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.2.tgz#3df10164b3ee040d90a5216d007fcabbf3e303c7"
+vscode-emmet-helper@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.3.tgz#395504d4d9b8fb0bf967af83aeef649631d1595e"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 6db1fd11ba0..021fe43a50a 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^3.0.8",
-    "vscode-emmet-helper": "1.2.1",
+    "vscode-emmet-helper": "1.2.3",
     "vscode-html-languageservice": "^2.1.1",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index 2f661bfea88..7cabc126d6c 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.8:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
 
-vscode-emmet-helper@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.1.tgz#dc4a3c83a3f1d48f4e9e1a5cce0e63f24b6eb843"
+vscode-emmet-helper@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.3.tgz#395504d4d9b8fb0bf967af83aeef649631d1595e"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"

From 84318e5892e0d14e37b34cc9015cb21723b490f2 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 26 Mar 2018 23:30:24 +0200
Subject: [PATCH 049/383] There should be an API command to execute the color
 provider like we have for code complete and others. Fixes #45867

---
 src/vs/editor/contrib/colorPicker/color.ts    | 61 +++++++++++++++++++
 .../workbench/api/node/extHostApiCommands.ts  | 44 ++++++++++++-
 .../api/node/extHostLanguageFeatures.ts       |  6 +-
 .../api/node/extHostTypeConverters.ts         | 27 +++++---
 .../api/extHostApiCommands.test.ts            | 51 ++++++++++++++++
 .../api/extHostLanguageFeatures.test.ts       | 23 +++++++
 6 files changed, 200 insertions(+), 12 deletions(-)

diff --git a/src/vs/editor/contrib/colorPicker/color.ts b/src/vs/editor/contrib/colorPicker/color.ts
index d064e5e27f3..e3f8d687510 100644
--- a/src/vs/editor/contrib/colorPicker/color.ts
+++ b/src/vs/editor/contrib/colorPicker/color.ts
@@ -3,10 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import URI from 'vs/base/common/uri';
+
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ColorProviderRegistry, DocumentColorProvider, IColorInformation, IColorPresentation } from 'vs/editor/common/modes';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { ITextModel } from 'vs/editor/common/model';
+import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
+import { Range, IRange } from 'vs/editor/common/core/range';
+import { illegalArgument } from 'vs/base/common/errors';
+import { IModelService } from 'vs/editor/common/services/modelService';
+
 
 export interface IColorData {
 	colorInfo: IColorInformation;
@@ -30,3 +37,57 @@ export function getColors(model: ITextModel): TPromise<IColorData[]> {
 export function getColorPresentations(model: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider): TPromise<IColorPresentation[]> {
 	return asWinJsPromise(token => provider.provideColorPresentations(model, colorInfo, token));
 }
+
+registerLanguageCommand('_executeDocumentColorProvider', function (accessor, args) {
+
+	const { resource } = args;
+	if (!(resource instanceof URI)) {
+		throw illegalArgument();
+	}
+
+	const model = accessor.get(IModelService).getModel(resource);
+	if (!model) {
+		throw illegalArgument();
+	}
+
+	const rawCIs: { range: IRange, color: [number, number, number, number] }[] = [];
+	const providers = ColorProviderRegistry.ordered(model).reverse();
+	const promises = providers.map(provider => asWinJsPromise(token => provider.provideDocumentColors(model, token)).then(result => {
+		if (Array.isArray(result)) {
+			for (let ci of result) {
+				rawCIs.push({ range: ci.range, color: [ci.color.red, ci.color.green, ci.color.blue, ci.color.alpha] });
+			}
+		}
+	}));
+
+	return TPromise.join(promises).then(() => rawCIs);
+});
+
+
+registerLanguageCommand('_executeColorPresentationProvider', function (accessor, args) {
+
+	const { resource, color, range } = args;
+	if (!(resource instanceof URI) || !Array.isArray(color) || color.length !== 4 || !Range.isIRange(range)) {
+		throw illegalArgument();
+	}
+	const [red, green, blue, alpha] = color;
+
+	const model = accessor.get(IModelService).getModel(resource);
+	if (!model) {
+		throw illegalArgument();
+	}
+
+	const colorInfo = {
+		range,
+		color: { red, green, blue, alpha }
+	};
+
+	const presentations: IColorPresentation[] = [];
+	const providers = ColorProviderRegistry.ordered(model).reverse();
+	const promises = providers.map(provider => asWinJsPromise(token => provider.provideColorPresentations(model, colorInfo, token)).then(result => {
+		if (Array.isArray(result)) {
+			presentations.push(...result);
+		}
+	}));
+	return TPromise.join(promises).then(() => presentations);
+});
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index 3122072f43c..b9d2e6ba55d 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -10,6 +10,8 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import * as vscode from 'vscode';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import * as types from 'vs/workbench/api/node/extHostTypes';
+import { IRawColorInfo } from 'vs/workbench/api/node/extHost.protocol';
+
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
 import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
@@ -177,7 +179,21 @@ export class ExtHostApiCommands {
 			args: [],
 			returns: 'An array of task handles'
 		});
-
+		this._register('vscode.executeDocumentColorProvider', this._executeDocumentColorProvider, {
+			description: 'Execute document color provider.',
+			args: [
+				{ name: 'uri', description: 'Uri of a text document', constraint: URI },
+			],
+			returns: 'A promise that resolves to an array of ColorInformation objects.'
+		});
+		this._register('vscode.executeColorPresentationProvider', this._executeColorPresentationProvider, {
+			description: 'Execute color presentation provider.',
+			args: [
+				{ name: 'color', description: 'The color to show and insert', constraint: types.Color },
+				{ name: 'context', description: 'Context object with uri and range' }
+			],
+			returns: 'A promise that resolves to an array of ColorPresentation objects.'
+		});
 		this._register('vscode.previewHtml', (uri: URI, position?: vscode.ViewColumn, label?: string, options?: any) => {
 			return this._commands.executeCommand('_workbench.previewHtml',
 				uri,
@@ -391,6 +407,32 @@ export class ExtHostApiCommands {
 		});
 	}
 
+	private _executeDocumentColorProvider(resource: URI): Thenable<types.ColorInformation[]> {
+		const args = {
+			resource
+		};
+		return this._commands.executeCommand<IRawColorInfo[]>('_executeDocumentColorProvider', args).then(result => {
+			if (result) {
+				return result.map(ci => ({ range: typeConverters.toRange(ci.range), color: typeConverters.Color.to(ci.color) }));
+			}
+			return [];
+		});
+	}
+
+	private _executeColorPresentationProvider(color: types.Color, context: { uri: URI, range: types.Range }): Thenable<types.ColorPresentation[]> {
+		const args = {
+			resource: context.uri,
+			color: typeConverters.Color.from(color),
+			range: typeConverters.fromRange(context.range),
+		};
+		return this._commands.executeCommand<modes.IColorPresentation[]>('_executeColorPresentationProvider', args).then(result => {
+			if (result) {
+				return result.map(typeConverters.ColorPresentation.to);
+			}
+			return [];
+		});
+	}
+
 	private _executeDocumentSymbolProvider(resource: URI): Thenable<types.SymbolInformation[]> {
 		const args = {
 			resource
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index cb69eb21452..55d6a6e3d8a 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { mixin } from 'vs/base/common/objects';
 import * as vscode from 'vscode';
 import * as TypeConverters from 'vs/workbench/api/node/extHostTypeConverters';
-import { Range, Disposable, CompletionList, SnippetString, Color, CodeActionKind } from 'vs/workbench/api/node/extHostTypes';
+import { Range, Disposable, CompletionList, SnippetString, CodeActionKind } from 'vs/workbench/api/node/extHostTypes';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
@@ -780,7 +780,7 @@ class ColorProviderAdapter {
 
 			const colorInfos: IRawColorInfo[] = colors.map(ci => {
 				return {
-					color: [ci.color.red, ci.color.green, ci.color.blue, ci.color.alpha] as [number, number, number, number],
+					color: TypeConverters.Color.from(ci.color),
 					range: TypeConverters.fromRange(ci.range)
 				};
 			});
@@ -792,7 +792,7 @@ class ColorProviderAdapter {
 	provideColorPresentations(resource: URI, raw: IRawColorInfo): TPromise<modes.IColorPresentation[]> {
 		const document = this._documents.getDocumentData(resource).document;
 		const range = TypeConverters.toRange(raw.range);
-		const color = new Color(raw.color[0], raw.color[1], raw.color[2], raw.color[3]);
+		const color = TypeConverters.Color.to(raw.color);
 		return asWinJsPromise(token => this._provider.provideColorPresentations(color, { document, range }, token)).then(value => {
 			return value.map(TypeConverters.ColorPresentation.from);
 		});
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index bf5bf34612d..0f412156674 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -83,7 +83,6 @@ export function fromPosition(position: types.Position): IPosition {
 	return { lineNumber: position.line + 1, column: position.character + 1 };
 }
 
-
 export function fromDiagnostic(value: vscode.Diagnostic): IMarkerData {
 	return {
 		...fromRange(value.range),
@@ -245,7 +244,7 @@ export const TextEdit = {
 			range: fromRange(edit.range)
 		};
 	},
-	to(edit: modes.TextEdit): vscode.TextEdit {
+	to(edit: modes.TextEdit): types.TextEdit {
 		let result = new types.TextEdit(toRange(edit.range), edit.text);
 		result.newEol = EndOfLine.to(edit.eol);
 		return result;
@@ -547,12 +546,15 @@ export namespace DocumentLink {
 }
 
 export namespace ColorPresentation {
-	export function to(colorPresentation: modes.IColorPresentation): vscode.ColorPresentation {
-		return {
-			label: colorPresentation.label,
-			textEdit: colorPresentation.textEdit ? TextEdit.to(colorPresentation.textEdit) : undefined,
-			additionalTextEdits: colorPresentation.additionalTextEdits ? colorPresentation.additionalTextEdits.map(value => TextEdit.to(value)) : undefined
-		};
+	export function to(colorPresentation: modes.IColorPresentation): types.ColorPresentation {
+		let cp = new types.ColorPresentation(colorPresentation.label);
+		if (colorPresentation.textEdit) {
+			cp.textEdit = TextEdit.to(colorPresentation.textEdit);
+		}
+		if (colorPresentation.additionalTextEdits) {
+			cp.additionalTextEdits = colorPresentation.additionalTextEdits.map(value => TextEdit.to(value));
+		}
+		return cp;
 	}
 
 	export function from(colorPresentation: vscode.ColorPresentation): modes.IColorPresentation {
@@ -564,6 +566,15 @@ export namespace ColorPresentation {
 	}
 }
 
+export namespace Color {
+	export function to(c: [number, number, number, number]): types.Color {
+		return new types.Color(c[0], c[1], c[2], c[3]);
+	}
+	export function from(color: types.Color): [number, number, number, number] {
+		return [color.red, color.green, color.blue, color.alpha];
+	}
+}
+
 export namespace TextDocumentSaveReason {
 
 	export function to(reason: SaveReason): vscode.TextDocumentSaveReason {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
index 5e6b7013ec1..3ddac7d1918 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
@@ -522,4 +522,55 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			});
 		});
 	});
+
+
+	test('Color provider', function () {
+
+		disposables.push(extHost.registerColorProvider(defaultSelector, <vscode.DocumentColorProvider>{
+			provideDocumentColors(): vscode.ColorInformation[] {
+				return [new types.ColorInformation(new types.Range(0, 0, 0, 20), new types.Color(0.1, 0.2, 0.3, 0.4))];
+			},
+			provideColorPresentations(color: vscode.Color, context: { range: vscode.Range, document: vscode.TextDocument }): vscode.ColorPresentation[] {
+				const cp = new types.ColorPresentation('#ABC');
+				cp.textEdit = types.TextEdit.replace(new types.Range(1, 0, 1, 20), '#ABC');
+				cp.additionalTextEdits = [types.TextEdit.insert(new types.Position(2, 20), '*')];
+				return [cp];
+			}
+		}));
+
+		return rpcProtocol.sync().then(() => {
+			return commands.executeCommand<vscode.ColorInformation[]>('vscode.executeDocumentColorProvider', model.uri).then(value => {
+				assert.equal(value.length, 1);
+				let [first] = value;
+
+				assert.equal(first.color.red, 0.1);
+				assert.equal(first.color.green, 0.2);
+				assert.equal(first.color.blue, 0.3);
+				assert.equal(first.color.alpha, 0.4);
+				assert.equal(first.range.start.line, 0);
+				assert.equal(first.range.start.character, 0);
+				assert.equal(first.range.end.line, 0);
+				assert.equal(first.range.end.character, 20);
+			});
+		}).then(() => {
+			const color = new types.Color(0.5, 0.6, 0.7, 0.8);
+			const range = new types.Range(0, 0, 0, 20);
+			return commands.executeCommand<vscode.ColorPresentation[]>('vscode.executeColorPresentationProvider', color, { uri: model.uri, range }).then(value => {
+				assert.equal(value.length, 1);
+				let [first] = value;
+
+				assert.equal(first.label, '#ABC');
+				assert.equal(first.textEdit.newText, '#ABC');
+				assert.equal(first.textEdit.range.start.line, 1);
+				assert.equal(first.textEdit.range.start.character, 0);
+				assert.equal(first.textEdit.range.end.line, 1);
+				assert.equal(first.textEdit.range.end.character, 20);
+				assert.equal(first.additionalTextEdits.length, 1);
+				assert.equal(first.additionalTextEdits[0].range.start.line, 2);
+				assert.equal(first.additionalTextEdits[0].range.start.character, 20);
+				assert.equal(first.additionalTextEdits[0].range.end.line, 2);
+				assert.equal(first.additionalTextEdits[0].range.end.character, 20);
+			});
+		});
+	});
 });
diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
index ad73ec6a899..daeba76fd08 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -45,6 +45,7 @@ import * as vscode from 'vscode';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
+import { getColors } from 'vs/editor/contrib/colorPicker/color';
 
 const defaultSelector = { scheme: 'far' };
 const model: ITextModel = EditorModel.createFromString(
@@ -1166,4 +1167,26 @@ suite('ExtHostLanguageFeatures', function () {
 			});
 		});
 	});
+
+	test('Document colors, data conversion', function () {
+
+		disposables.push(extHost.registerColorProvider(defaultSelector, <vscode.DocumentColorProvider>{
+			provideDocumentColors(): vscode.ColorInformation[] {
+				return [new types.ColorInformation(new types.Range(0, 0, 0, 20), new types.Color(0.1, 0.2, 0.3, 0.4))];
+			},
+			provideColorPresentations(color: vscode.Color, context: { range: vscode.Range, document: vscode.TextDocument }): vscode.ColorPresentation[] {
+				return [];
+			}
+		}));
+
+		return rpcProtocol.sync().then(() => {
+			return getColors(model).then(value => {
+				assert.equal(value.length, 1);
+				let [first] = value;
+
+				assert.deepEqual(first.colorInfo.color, { red: 0.1, green: 0.2, blue: 0.3, alpha: 0.4 });
+				assert.deepEqual(first.colorInfo.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 21 });
+			});
+		});
+	});
 });

From 871e61084860e57b35a50f20c7e506bfe988f3dd Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 26 Mar 2018 15:04:51 -0700
Subject: [PATCH 050/383] Respect selfClosingStyle when joining tags Fixes
 #44417

---
 extensions/emmet/src/splitJoinTag.ts         | 10 +++++-
 extensions/emmet/src/test/tagActions.test.ts | 33 ++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
index 67a403bce29..38d2b163c01 100644
--- a/extensions/emmet/src/splitJoinTag.ts
+++ b/extensions/emmet/src/splitJoinTag.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { HtmlNode } from 'EmmetNode';
-import { getNode, parseDocument, validate } from './util';
+import { getNode, parseDocument, validate, getEmmetMode, getEmmetConfiguration } from './util';
 
 export function splitJoinTag() {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
@@ -48,6 +48,14 @@ function getRangesToReplace(document: vscode.TextDocument, nodeToUpdate: HtmlNod
 		let end = <vscode.Position>nodeToUpdate.end;
 		rangeToReplace = new vscode.Range(start, end);
 		textToReplaceWith = '/>';
+
+		const emmetMode = getEmmetMode(document.languageId, []) || '';
+		const emmetConfig = getEmmetConfiguration(emmetMode);
+		if (emmetMode && emmetConfig.syntaxProfiles[emmetMode] &&
+			(emmetConfig.syntaxProfiles[emmetMode]['selfClosingStyle'] === 'xhtml' || emmetConfig.syntaxProfiles[emmetMode]['self_closing_tag'] === 'xhtml')) {
+			textToReplaceWith = ' ' + textToReplaceWith;
+		}
+
 	}
 
 	return new vscode.TextEdit(rangeToReplace, textToReplaceWith);
diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts
index fa4f680cd18..db664524eb1 100644
--- a/extensions/emmet/src/test/tagActions.test.ts
+++ b/extensions/emmet/src/test/tagActions.test.ts
@@ -5,7 +5,7 @@
 
 import 'mocha';
 import * as assert from 'assert';
-import { Selection } from 'vscode';
+import { Selection, workspace } from 'vscode';
 import { withRandomFileEditor, closeAllEditors } from './testUtils';
 import { removeTag } from '../removeTag';
 import { updateTag } from '../updateTag';
@@ -14,7 +14,10 @@ import { splitJoinTag } from '../splitJoinTag';
 import { mergeLines } from '../mergeLines';
 
 suite('Tests for Emmet actions on html tags', () => {
-	teardown(closeAllEditors);
+	teardown(() => {
+		// Reset config and close all editors
+		return workspace.getConfiguration('emmet').update('syntaxProfiles', {}).then(closeAllEditors);
+	});
 
 	const contents = `
 	<div class="hello">
@@ -102,6 +105,32 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('split/join tag in jsx with xhtml self closing tag', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li><span /></li>
+			<li><span>There</span></li>
+			<div><li><span>Bye</span></li></div>
+		</ul>
+		<span></span>
+	</div>
+	`;
+		return workspace.getConfiguration('emmet').update('syntaxProfiles', {jsx: {selfClosingStyle: 'xhtml'}}).then(() =>{
+			return withRandomFileEditor(contents, 'jsx', (editor, doc) => {
+				editor.selections = [
+					new Selection(3, 17, 3, 17), // join tag
+					new Selection(7, 5, 7, 5), // split tag
+				];
+
+				return splitJoinTag()!.then(() => {
+					assert.equal(doc.getText(), expectedContents);
+					return Promise.resolve()
+				});
+			});
+		});
+	});
+
 	test('match tag with mutliple cursors', () => {
 		return withRandomFileEditor(contents, 'html', (editor, doc) => {
 			editor.selections = [

From 6baa2dd2139166a8b19392bcd450eecf80709eb9 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 27 Mar 2018 00:10:47 +0200
Subject: [PATCH 051/383] Case insensitive filesystems...  (#45589)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 03ded3fde53..fc2215ead12 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -7,7 +7,7 @@
 
 import 'vs/css!./quickInput';
 import { Component } from 'vs/workbench/common/component';
-import { IQuickInputService } from 'vs/platform/quickInput/common/quickInput';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { Dimension } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';

From 6eebe4ba3a69030a75206399168a34eaafd16197 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 26 Mar 2018 14:44:10 -0700
Subject: [PATCH 052/383] Use _ prefix for private

---
 .../src/features/diagnostics.ts               | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/extensions/typescript-language-features/src/features/diagnostics.ts b/extensions/typescript-language-features/src/features/diagnostics.ts
index d1e6fae809a..5508d6fd98a 100644
--- a/extensions/typescript-language-features/src/features/diagnostics.ts
+++ b/extensions/typescript-language-features/src/features/diagnostics.ts
@@ -38,28 +38,28 @@ const allDiagnosticKinds = [DiagnosticKind.Syntax, DiagnosticKind.Semantic, Diag
 
 export class DiagnosticsManager {
 
-	private readonly diagnostics = new Map<DiagnosticKind, DiagnosticSet>();
-	private readonly currentDiagnostics: vscode.DiagnosticCollection;
+	private readonly _diagnostics = new Map<DiagnosticKind, DiagnosticSet>();
+	private readonly _currentDiagnostics: vscode.DiagnosticCollection;
 	private _validate: boolean = true;
 
 	constructor(
 		language: string
 	) {
 		for (const kind of allDiagnosticKinds) {
-			this.diagnostics.set(kind, new DiagnosticSet());
+			this._diagnostics.set(kind, new DiagnosticSet());
 		}
 
-		this.currentDiagnostics = vscode.languages.createDiagnosticCollection(language);
+		this._currentDiagnostics = vscode.languages.createDiagnosticCollection(language);
 	}
 
 	public dispose() {
-		this.currentDiagnostics.dispose();
+		this._currentDiagnostics.dispose();
 	}
 
 	public reInitialize(): void {
-		this.currentDiagnostics.clear();
+		this._currentDiagnostics.clear();
 
-		for (const diagnosticSet of this.diagnostics.values()) {
+		for (const diagnosticSet of this._diagnostics.values()) {
 			diagnosticSet.clear();
 		}
 	}
@@ -70,7 +70,7 @@ export class DiagnosticsManager {
 		}
 		this._validate = value;
 		if (!value) {
-			this.currentDiagnostics.clear();
+			this._currentDiagnostics.clear();
 		}
 	}
 
@@ -79,7 +79,7 @@ export class DiagnosticsManager {
 		file: vscode.Uri,
 		syntaxDiagnostics: vscode.Diagnostic[]
 	): void {
-		const diagnostics = this.diagnostics.get(kind);
+		const diagnostics = this._diagnostics.get(kind);
 		if (diagnostics) {
 			diagnostics.set(file, syntaxDiagnostics);
 			this.updateCurrentDiagnostics(file);
@@ -87,11 +87,11 @@ export class DiagnosticsManager {
 	}
 
 	public configFileDiagnosticsReceived(file: vscode.Uri, diagnostics: vscode.Diagnostic[]): void {
-		this.currentDiagnostics.set(file, diagnostics);
+		this._currentDiagnostics.set(file, diagnostics);
 	}
 
 	public delete(resource: vscode.Uri): void {
-		this.currentDiagnostics.delete(resource);
+		this._currentDiagnostics.delete(resource);
 	}
 
 	private updateCurrentDiagnostics(file: vscode.Uri) {
@@ -100,13 +100,13 @@ export class DiagnosticsManager {
 		}
 
 		const allDiagnostics = allDiagnosticKinds.reduce((sum, kind) => {
-			sum.push(...this.diagnostics.get(kind)!.get(file));
+			sum.push(...this._diagnostics.get(kind)!.get(file));
 			return sum;
 		}, [] as vscode.Diagnostic[]);
-		this.currentDiagnostics.set(file, allDiagnostics);
+		this._currentDiagnostics.set(file, allDiagnostics);
 	}
 
 	public getDiagnostics(file: vscode.Uri): vscode.Diagnostic[] {
-		return this.currentDiagnostics.get(file) || [];
+		return this._currentDiagnostics.get(file) || [];
 	}
 }
\ No newline at end of file

From a1c693ab1ab83dbbff12784df0745051fdf2943d Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 26 Mar 2018 15:28:43 -0700
Subject: [PATCH 053/383] Allow disabling JS/TS suggestion actions

Fixes #46590
---
 .../typescript-language-features/package.json | 12 ++++++++++
 .../package.nls.json                          |  4 +++-
 .../src/features/diagnostics.ts               | 23 +++++++++++++++----
 .../src/languageProvider.ts                   | 15 ++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 30c59877aeb..ca8c919f1ba 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -413,6 +413,18 @@
           "type": "boolean",
           "default": true,
           "description": "%typescript.experimental.syntaxFolding%"
+        },
+        "javascript.suggestionActions.enabled": {
+          "type": "boolean",
+          "default": true,
+          "description": "%javascript.suggestionActions.enabled%",
+          "scope": "window"
+        },
+        "typescript.suggestionActions.enabled": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.suggestionActions.enabled%",
+          "scope": "window"
         }
       }
     },
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index a63addb4483..a3a7df1f473 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -53,5 +53,7 @@
 	"typescript.autoImportSuggestions.enabled": "Enable/disable auto import suggestions. Requires TypeScript >=2.6.1",
 	"typescript.experimental.syntaxFolding": "Enables/disables syntax aware folding markers.",
 	"taskDefinition.tsconfig.description": "The tsconfig file that defines the TS build.",
-	"typescript.organizeImports": "Organize Imports"
+	"typescript.organizeImports": "Organize Imports",
+	"javascript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for JavaScript files in the editor. Requires TypeScript >= 2.8",
+	"typescript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for TypeScript files in the editor. Requires TypeScript >= 2.8."
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/features/diagnostics.ts b/extensions/typescript-language-features/src/features/diagnostics.ts
index 5508d6fd98a..1bde0c8353e 100644
--- a/extensions/typescript-language-features/src/features/diagnostics.ts
+++ b/extensions/typescript-language-features/src/features/diagnostics.ts
@@ -41,6 +41,7 @@ export class DiagnosticsManager {
 	private readonly _diagnostics = new Map<DiagnosticKind, DiagnosticSet>();
 	private readonly _currentDiagnostics: vscode.DiagnosticCollection;
 	private _validate: boolean = true;
+	private _enableSuggestions: boolean = true;
 
 	constructor(
 		language: string
@@ -68,12 +69,24 @@ export class DiagnosticsManager {
 		if (this._validate === value) {
 			return;
 		}
+
 		this._validate = value;
 		if (!value) {
 			this._currentDiagnostics.clear();
 		}
 	}
 
+	public set enableSuggestions(value: boolean) {
+		if (this._enableSuggestions === value) {
+			return;
+		}
+
+		this._enableSuggestions = value;
+		if (!value) {
+			this._currentDiagnostics.clear();
+		}
+	}
+
 	public diagnosticsReceived(
 		kind: DiagnosticKind,
 		file: vscode.Uri,
@@ -99,10 +112,12 @@ export class DiagnosticsManager {
 			return;
 		}
 
-		const allDiagnostics = allDiagnosticKinds.reduce((sum, kind) => {
-			sum.push(...this._diagnostics.get(kind)!.get(file));
-			return sum;
-		}, [] as vscode.Diagnostic[]);
+		const allDiagnostics: vscode.Diagnostic[] = [];
+		allDiagnostics.push(...this._diagnostics.get(DiagnosticKind.Syntax)!.get(file));
+		allDiagnostics.push(...this._diagnostics.get(DiagnosticKind.Semantic)!.get(file));
+		if (this._enableSuggestions) {
+			allDiagnostics.push(...this._diagnostics.get(DiagnosticKind.Suggestion)!.get(file));
+		}
 		this._currentDiagnostics.set(file, allDiagnostics);
 	}
 
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index cc7373b15ae..e4c4f7de60d 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -22,6 +22,7 @@ import { memoize } from './utils/memoize';
 import { disposeAll } from './utils/dipose';
 
 const validateSetting = 'validate.enable';
+const suggestionSetting = 'suggestionActions.enabled';
 const foldingSetting = 'typescript.experimental.syntaxFolding';
 
 export default class LanguageProvider {
@@ -32,6 +33,7 @@ export default class LanguageProvider {
 	private readonly toUpdateOnConfigurationChanged: ({ updateConfiguration: () => void })[] = [];
 
 	private _validate: boolean = true;
+	private _enableSuggestionDiagnostics: boolean = true;
 
 	private readonly disposables: Disposable[] = [];
 	private readonly versionDependentDisposables: Disposable[] = [];
@@ -165,6 +167,7 @@ export default class LanguageProvider {
 	private configurationChanged(): void {
 		const config = workspace.getConfiguration(this.id);
 		this.updateValidate(config.get(validateSetting, true));
+		this.updateSuggestionDiagnostics(config.get(suggestionSetting, true));
 
 		for (const toUpdate of this.toUpdateOnConfigurationChanged) {
 			toUpdate.updateConfiguration();
@@ -204,6 +207,18 @@ export default class LanguageProvider {
 		}
 	}
 
+	private updateSuggestionDiagnostics(value: boolean) {
+		if (this._enableSuggestionDiagnostics === value) {
+			return;
+		}
+
+		this._enableSuggestionDiagnostics = value;
+		this.diagnosticsManager.enableSuggestions = value;
+		if (value) {
+			this.triggerAllDiagnostics();
+		}
+	}
+
 	public reInitialize(): void {
 		this.diagnosticsManager.reInitialize();
 		this.bufferSyncSupport.reOpenDocuments();

From c2b9b821dd9261061dc846a5acaf07e106a1358a Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 26 Mar 2018 15:30:57 -0700
Subject: [PATCH 054/383] Add "toggle search view position" command

---
 .../parts/search/common/constants.ts          |  2 ++
 .../electron-browser/search.contribution.ts   | 25 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts
index 1c9a877bd20..fe9c22e0725 100644
--- a/src/vs/workbench/parts/search/common/constants.ts
+++ b/src/vs/workbench/parts/search/common/constants.ts
@@ -20,6 +20,8 @@ export const ToggleCaseSensitiveCommandId = 'toggleSearchCaseSensitive';
 export const ToggleWholeWordCommandId = 'toggleSearchWholeWord';
 export const ToggleRegexCommandId = 'toggleSearchRegex';
 
+export const ToggleSearchViewPositionCommandId = 'search.action.toggleSearchViewPosition';
+
 export const SearchViewVisibleKey = new RawContextKey<boolean>('searchViewletVisible', true);
 export const InputBoxFocusedKey = new RawContextKey<boolean>('inputBoxFocus', false);
 export const SearchInputBoxFocusedKey = new RawContextKey<boolean>('searchInputBoxFocus', false);
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index dad5c628fea..8470d739618 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -54,10 +54,11 @@ import { Schemas } from 'vs/base/common/network';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction } from 'vs/workbench/parts/search/browser/searchActions';
-import { VIEW_ID } from 'vs/platform/search/common/search';
+import { VIEW_ID, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { SearchViewLocationUpdater } from 'vs/workbench/parts/search/browser/searchViewLocationUpdater';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration';
 
 registerSingleton(ISearchWorkbenchService, SearchWorkbenchService);
 replaceContributions();
@@ -233,6 +234,28 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	order: 2
 });
 
+CommandsRegistry.registerCommand({
+	id: Constants.ToggleSearchViewPositionCommandId,
+	handler: (accessor) => {
+		const configurationService = accessor.get(IConfigurationService);
+		const currentValue = configurationService.getValue<ISearchConfigurationProperties>('search').location;
+		const toggleValue = currentValue === 'sidebar' ? 'panel' : 'sidebar';
+
+		configurationService.updateValue('search.location', toggleValue);
+	}
+});
+
+const toggleSearchViewPositionLabel = nls.localize('toggleSearchViewPositionLabel', "Toggle Search View Position");
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ToggleSearchViewPositionCommandId,
+		title: toggleSearchViewPositionLabel
+	},
+	when: Constants.SearchViewVisibleKey,
+	group: 'search',
+	order: 3
+});
+
 const FIND_IN_FOLDER_ID = 'filesExplorer.findInFolder';
 CommandsRegistry.registerCommand({
 	id: FIND_IN_FOLDER_ID,

From af9dc731ca13b2e65f176a0f56869d95927e6a0d Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 26 Mar 2018 16:28:46 -0700
Subject: [PATCH 055/383] Fix #46519 - search result count badges should remain
 left-aligned in a narrow search view

---
 .../workbench/parts/search/browser/media/searchview.css  | 9 +++++++--
 src/vs/workbench/parts/search/browser/searchView.ts      | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/media/searchview.css b/src/vs/workbench/parts/search/browser/media/searchview.css
index f8c247cb778..7d0f83a45a6 100644
--- a/src/vs/workbench/parts/search/browser/media/searchview.css
+++ b/src/vs/workbench/parts/search/browser/media/searchview.css
@@ -179,6 +179,11 @@
 	padding: 0;
 }
 
+.search-view:not(.wide) .foldermatch .monaco-icon-label,
+.search-view:not(.wide) .filematch .monaco-icon-label {
+	flex: 1;
+}
+
 .search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .foldermatch .monaco-icon-label,
 .search-view .monaco-tree .monaco-tree-row.focused .foldermatch .monaco-icon-label,
 .search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .filematch .monaco-icon-label,
@@ -193,8 +198,8 @@
 	margin-left: 0.8em;
 }
 
-.search-view .foldermatch .badge,
-.search-view .filematch .badge {
+.search-view.wide .foldermatch .badge,
+.search-view.wide .filematch .badge {
 	margin-left: 10px;
 }
 
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index a41280fc18c..89e8cef7800 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -69,6 +69,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	private static readonly MAX_TEXT_RESULTS = 10000;
 	private static readonly SHOW_REPLACE_STORAGE_KEY = 'vs.search.show.replace';
 
+	private static readonly WIDE_CLASS_NAME = 'wide';
+	private static readonly WIDE_VIEW_SIZE = 600;
+
 	private isDisposed: boolean;
 
 	private queryBuilder: QueryBuilder;
@@ -748,6 +751,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			return;
 		}
 
+		if (this.size.width >= SearchView.WIDE_VIEW_SIZE) {
+			this.getContainer().addClass(SearchView.WIDE_CLASS_NAME);
+		} else {
+			this.getContainer().removeClass(SearchView.WIDE_CLASS_NAME);
+		}
+
 		this.searchWidget.setWidth(this.size.width - 28 /* container margin */);
 
 		this.inputPatternIncludes.setWidth(this.size.width - 28 /* container margin */);

From c05e57d91e50d53d487a9113c1553ca73311fa6c Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Mon, 26 Mar 2018 16:36:31 -0700
Subject: [PATCH 056/383] Search for similar issues for extensions in issue
 reporter

---
 .../issue/issueReporterMain.ts                | 98 ++++++++++++++++---
 1 file changed, 83 insertions(+), 15 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index e179fc5c52a..aac3ec705b0 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -69,6 +69,7 @@ export class IssueReporter extends Disposable {
 	private numberOfSearchResultsDisplayed = 0;
 	private receivedSystemInfo = false;
 	private receivedPerformanceInfo = false;
+	private shouldQueueSearch = false;
 
 	constructor(configuration: IssueReporterConfiguration) {
 		super();
@@ -324,15 +325,28 @@ export class IssueReporter extends Disposable {
 
 		this.addEventListener('issue-source', 'change', (event: Event) => {
 			const fileOnExtension = JSON.parse((<HTMLInputElement>event.target).value);
-			this.issueReporterModel.update({ fileOnExtension: fileOnExtension, includeExtensions: !fileOnExtension });
+			this.issueReporterModel.update({ fileOnExtension: fileOnExtension, includeExtensions: !fileOnExtension, selectedExtension: null });
 			this.render();
-			this.search();
+
+			const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+			if (fileOnExtension) {
+				this.searchExtensionIssues(title);
+			} else {
+				const description = this.issueReporterModel.getData().issueDescription;
+				this.searchVSCodeIssues(title, description);
+			}
 		});
 
 		this.addEventListener('description', 'input', (event: Event) => {
 			const issueDescription = (<HTMLInputElement>event.target).value;
 			this.issueReporterModel.update({ issueDescription });
-			this.search();
+
+			// Only search for extension issues on title change
+			const fileOnExtension = this.issueReporterModel.getData().fileOnExtension;
+			if (!fileOnExtension) {
+				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+				this.searchVSCodeIssues(title, issueDescription);
+			}
 		});
 
 		this.addEventListener('issue-title', 'input', (e) => {
@@ -344,7 +358,13 @@ export class IssueReporter extends Disposable {
 				hide(lengthValidationMessage);
 			}
 
-			this.search();
+			const fileOnExtension = this.issueReporterModel.getData().fileOnExtension;
+			if (fileOnExtension) {
+				this.searchExtensionIssues(title);
+			} else {
+				const description = this.issueReporterModel.getData().issueDescription;
+				this.searchVSCodeIssues(title, description);
+			}
 		});
 
 		this.addEventListener('github-submit-btn', 'click', () => this.createIssue());
@@ -415,16 +435,12 @@ export class IssueReporter extends Disposable {
 		return false;
 	}
 
-	private search(): void {
-		// Only search issues in VSCode for now.
-		const fileOnExtension = this.issueReporterModel.getData().fileOnExtension;
-		if (fileOnExtension) {
-			this.clearSearchResults();
-			return;
-		}
+	private getExtensionRepositoryUrl(): string {
+		const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+		return selectedExtension && selectedExtension.manifest && selectedExtension.manifest.repository && selectedExtension.manifest.repository.url;
+	}
 
-		const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
-		const issueDescription = (<HTMLInputElement>document.getElementById('description')).value;
+	private searchVSCodeIssues(title: string, issueDescription: string): void {
 		if (title || issueDescription) {
 			this.searchDuplicates(title, issueDescription);
 		} else {
@@ -432,12 +448,59 @@ export class IssueReporter extends Disposable {
 		}
 	}
 
+	private searchExtensionIssues(title: string): void {
+		const url = this.getExtensionRepositoryUrl();
+		if (title) {
+			const matches = /^https?:\/\/github\.com\/(.*)(?:.git)/.exec(url);
+			if (matches && matches.length) {
+				const repo = matches[1];
+				return this.searchGitHub(repo, title);
+			}
+		}
+
+		this.clearSearchResults();
+	}
+
 	private clearSearchResults(): void {
 		const similarIssues = document.getElementById('similar-issues');
 		similarIssues.innerHTML = '';
 		this.numberOfSearchResultsDisplayed = 0;
 	}
 
+	@debounce(300)
+	private searchGitHub(repo: string, title: string): void {
+		const query = `is:issue+repo:${repo}+${title}`;
+		const similarIssues = document.getElementById('similar-issues');
+
+		window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => {
+			response.json().then(result => {
+				similarIssues.innerHTML = '';
+				if (result && result.items) {
+					this.displaySearchResults(result.items);
+				} else {
+					// If the items property isn't present, the rate limit has been hit
+					const message = $('div.list-title');
+					message.textContent = localize('rateLimited', "GitHub query limit exceeded. Please wait.");
+					similarIssues.appendChild(message);
+
+					const resetTime = response.headers.get('X-RateLimit-Reset');
+					const timeToWait = parseInt(resetTime) - Math.floor(Date.now() / 1000);
+					if (this.shouldQueueSearch) {
+						this.shouldQueueSearch = false;
+						setTimeout(() => {
+							this.searchGitHub(repo, title);
+							this.shouldQueueSearch = true;
+						}, timeToWait * 1000);
+					}
+				}
+			}).catch(e => {
+				this.logSearchError(e);
+			});
+		}).catch(e => {
+			this.logSearchError(e);
+		});
+	}
+
 	@debounce(300)
 	private searchDuplicates(title: string, body: string): void {
 		const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
@@ -679,8 +742,7 @@ export class IssueReporter extends Disposable {
 	private getIssueUrlWithTitle(issueTitle: string): string {
 		let repositoryUrl = product.reportIssueUrl;
 		if (this.issueReporterModel.getData().fileOnExtension) {
-			const selectedExtension = this.issueReporterModel.getData().selectedExtension;
-			const extensionUrl = selectedExtension && selectedExtension.manifest && selectedExtension.manifest.repository && selectedExtension.manifest.repository.url;
+			const extensionUrl = this.getExtensionRepositoryUrl();
 			if (extensionUrl) {
 				// Remove '.git' suffix
 				repositoryUrl = `${extensionUrl.indexOf('.git') !== -1 ? extensionUrl.substr(0, extensionUrl.length - 4) : extensionUrl}/issues/new/`;
@@ -715,6 +777,12 @@ export class IssueReporter extends Disposable {
 			const matches = extensions.filter(extension => extension.identifier.id === selectedExtensionId);
 			if (matches.length) {
 				this.issueReporterModel.update({ selectedExtension: matches[0] });
+
+				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+				this.searchExtensionIssues(title);
+			} else {
+				this.issueReporterModel.update({ selectedExtension: null });
+				this.clearSearchResults();
 			}
 		});
 	}

From 91416ffab8a59b6f5a52abef6ff7920a5d067c1f Mon Sep 17 00:00:00 2001
From: Gus Hurovich <gushurovich@gmail.com>
Date: Mon, 26 Mar 2018 18:14:28 -0700
Subject: [PATCH 057/383] Stylesheet partial parse (#46376)

* First draft at partial parsing of css for emmet

* Partial parsing of stylesheets for Emmet

* Addressing feedback

* Refactoring and fixing little bug

* Liitle fix

* Equals are now equals

* We don't want emmet in selectors

* Skip comments when preparsing

* Addressing feedback, refactoring and cleaning up code.

* Update endPosition only if not eof

* Use function to find closing comment

* Don't check more than 5000 characters back
---
 .../emmet/src/defaultCompletionProvider.ts    |  4 +-
 extensions/emmet/src/util.ts                  | 99 +++++++++++++++++++
 2 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 458d1fc6d43..54aa40999d1 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { Node } from 'EmmetNode';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
-import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parseDocument, getEmmetConfiguration, getEmmetMode, isStyleSheet } from './util';
+import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument } from './util';
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 
@@ -40,7 +40,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			validateLocation = syntax === 'html' || isStyleSheet(document.languageId);
 			// If document can be css parsed, get currentNode
 			if (isStyleSheet(document.languageId)) {
-				const rootNode = parseDocument(document, false);
+				const rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : parseDocument(document, false);
 				if (!rootNode) {
 					return;
 				}
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index e9f21c463ae..4fed8eb00d2 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -128,6 +128,105 @@ export function parseDocument(document: vscode.TextDocument, showError: boolean
 	return undefined;
 }
 
+export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Node | undefined {
+
+	let startPosition = new vscode.Position(0, 0);
+	let endPosition = new vscode.Position(document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length);
+	const closeBrace = 125;
+	const openBrace = 123;
+	let slash = 47;
+	let star = 42;
+	let isCSS = document.languageId === 'css';
+
+	let singleLineCommentIndex = document.lineAt(position.line).text.indexOf('//');
+	if (!isCSS && singleLineCommentIndex > -1 && singleLineCommentIndex < position.character) {
+		return;
+	}
+
+	// Go forward until we found a closing brace.
+	let stream = new DocumentStreamReader(document, position);
+	while (!stream.eof() && !stream.eat(closeBrace)) {
+		if (stream.eat(slash)) {
+			if (stream.eat(slash) && !isCSS) {
+				// Single line Comment, we continue searching from next line.
+				stream.pos = new vscode.Position(stream.pos.line + 1, 0);
+			} else if (stream.eat(star)) {
+				stream.pos = findClosingCommentAfterPosition(document, stream.pos) || endPosition;
+			}
+		} else {
+			stream.next();
+		}
+	}
+
+	if (!stream.eof()) {
+		endPosition = stream.pos;
+	}
+
+	// Go back until we found an opening brace. If we find a closing one, we first find its opening brace and then we continue.
+	stream.pos = position;
+	let openBracesRemaining = 1;
+	let currentLine = position.line;
+	let limitCharacter = document.offsetAt(position) - 5000;
+	let limitPosition = limitCharacter > 0 ? document.positionAt(limitCharacter) : startPosition;
+
+	while (openBracesRemaining > 0 && !stream.sof()) {
+		if (position.line - stream.pos.line > 100 || stream.pos.isBeforeOrEqual(limitPosition)) {
+			return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
+		} else if (!isCSS && stream.pos.line !== currentLine) {
+			// In not CSS stylesheets, we need to skip singleLine comments.
+			currentLine = stream.pos.line;
+			let startLineComment = document.lineAt(currentLine).text.indexOf('//');
+			if (startLineComment > -1) {
+				stream.pos = new vscode.Position(currentLine, startLineComment);
+			}
+		}
+		let ch = stream.backUp(1);
+		if (ch === openBrace) {
+			openBracesRemaining--;
+		} else if (ch === closeBrace) {
+			if (isCSS) {
+				stream.next();
+				return parseStylesheet(new DocumentStreamReader(document, stream.pos, new vscode.Range(stream.pos, endPosition)));
+			}
+			openBracesRemaining++;
+		} else if (ch === slash) {
+			stream.backUp(1);
+			if (stream.peek() === star) {
+				stream.pos = findOpeningCommentBeforePosition(document, stream.pos) || startPosition;
+			} else {
+				stream.next();
+			}
+		}
+	}
+	// We are at an opening brace. We need to include its selector, but with one nonspace character is enough.
+	while (!stream.sof() && String.fromCharCode(stream.backUp(1)).match(/\s/)) { }
+
+	startPosition = stream.pos;
+	try {
+		return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
+	} catch (e) {
+	}
+}
+
+function findOpeningCommentBeforePosition(document: vscode.TextDocument, position: vscode.Position): vscode.Position | undefined {
+	let text = document.getText(new vscode.Range(0, 0, position.line, position.character));
+	let offset = text.lastIndexOf('/*');
+	if (offset === -1) {
+		return;
+	}
+	return document.positionAt(offset);
+}
+
+function findClosingCommentAfterPosition(document: vscode.TextDocument, position: vscode.Position): vscode.Position | undefined {
+	let text = document.getText(new vscode.Range(position.line, position.character, document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length));
+	let offset = text.indexOf('*/');
+	if (offset === -1) {
+		return;
+	}
+	offset += 2;
+	return document.positionAt(offset);
+}
+
 /**
  * Returns node corresponding to given position in the given root node
  */

From 4f10555e3ce694eaf96b061cd607c23f6bf58bdd Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 26 Mar 2018 18:30:37 -0700
Subject: [PATCH 058/383] Skip emmet inside comments in stylesheets #46434

---
 extensions/emmet/src/defaultCompletionProvider.ts | 6 +++---
 extensions/emmet/src/util.ts                      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 54aa40999d1..fb60c7124cc 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node } from 'EmmetNode';
+import { Node, Stylesheet } from 'EmmetNode';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
 import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument } from './util';
 
@@ -40,8 +40,8 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			validateLocation = syntax === 'html' || isStyleSheet(document.languageId);
 			// If document can be css parsed, get currentNode
 			if (isStyleSheet(document.languageId)) {
-				const rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : parseDocument(document, false);
-				if (!rootNode) {
+				const rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>parseDocument(document, false);
+				if (!rootNode || (rootNode.comments || []).some(x => position.isAfterOrEqual(x.start) && position.isBeforeOrEqual(x.end))) {
 					return;
 				}
 
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index 4fed8eb00d2..8dd1d2d21f5 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import parseStylesheet from '@emmetio/css-parser';
-import { Node, HtmlNode, CssToken, Property, Rule } from 'EmmetNode';
+import { Node, HtmlNode, CssToken, Property, Rule, Stylesheet } from 'EmmetNode';
 import { DocumentStreamReader } from './bufferStream';
 
 let _emmetHelper: any;
@@ -128,7 +128,7 @@ export function parseDocument(document: vscode.TextDocument, showError: boolean
 	return undefined;
 }
 
-export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Node | undefined {
+export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Stylesheet | undefined {
 
 	let startPosition = new vscode.Position(0, 0);
 	let endPosition = new vscode.Position(document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length);

From 2792b8f4374955e7500901397a5b19efb70fc087 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 26 Mar 2018 20:47:09 -0700
Subject: [PATCH 059/383] Skip emmet inside comments in stylesheets when
 running the command

---
 extensions/emmet/src/abbreviationActions.ts   | 14 +++++++----
 .../emmet/src/defaultCompletionProvider.ts    | 10 ++++----
 .../src/test/cssAbbreviationAction.test.ts    | 24 +++++++++++++++++++
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 9441ccdebde..dbde92a485e 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node, HtmlNode, Rule, Property } from 'EmmetNode';
+import { Node, HtmlNode, Rule, Property, Stylesheet } from 'EmmetNode';
 import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode } from './util';
 
 const trimRegex = /[\u00a0]*[\d|#|\-|\*|\u2022]+\.?/;
@@ -290,8 +290,7 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 			return;
 		}
 
-		let currentNode = getNode(rootNode, position, true);
-		if (!isValidLocationForEmmetAbbreviation(editor.document, currentNode, syntax, position, rangeToReplace)) {
+		if (!isValidLocationForEmmetAbbreviation(editor.document, rootNode, syntax, position, rangeToReplace)) {
 			return;
 		}
 
@@ -321,13 +320,18 @@ function fallbackTab(): Thenable<boolean | undefined> {
  * Checks if given position is a valid location to expand emmet abbreviation.
  * Works only on html and css/less/scss syntax
  * @param document current Text Document
- * @param currentNode parsed node at given position
+ * @param rootNode parsed document
  * @param syntax syntax of the abbreviation
  * @param position position to validate
  * @param abbreviationRange The range of the abbreviation for which given position is being validated
  */
-export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocument, currentNode: Node | null, syntax: string, position: vscode.Position, abbreviationRange: vscode.Range): boolean {
+export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocument, rootNode: Node | undefined, syntax: string, position: vscode.Position, abbreviationRange: vscode.Range): boolean {
+	const currentNode = rootNode ? getNode(rootNode, position, true) : null;
 	if (isStyleSheet(syntax)) {
+		const stylesheet = <Stylesheet>rootNode;
+		if (stylesheet && (stylesheet.comments || []).some(x => position.isAfterOrEqual(x.start) && position.isBeforeOrEqual(x.end))) {
+			return false;
+		}
 		// Continue validation only if the file was parse-able and the currentNode has been found
 		if (!currentNode) {
 			return true;
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index fb60c7124cc..57f2d46ea81 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -34,22 +34,20 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 		}
 
 		let validateLocation = false;
-		let currentNode: Node | null = null;
+		let rootNode: Stylesheet | undefined = undefined;
 
 		if (context.triggerKind !== vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) {
 			validateLocation = syntax === 'html' || isStyleSheet(document.languageId);
 			// If document can be css parsed, get currentNode
 			if (isStyleSheet(document.languageId)) {
-				const rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>parseDocument(document, false);
-				if (!rootNode || (rootNode.comments || []).some(x => position.isAfterOrEqual(x.start) && position.isBeforeOrEqual(x.end))) {
+				rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>parseDocument(document, false);
+				if (!rootNode) {
 					return;
 				}
-
-				currentNode = getNode(rootNode, position, true);
 			}
 		}
 
-		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, currentNode, syntax, position, extractAbbreviationResults.abbreviationRange)) {
+		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, rootNode, syntax, position, extractAbbreviationResults.abbreviationRange)) {
 			return;
 		}
 
diff --git a/extensions/emmet/src/test/cssAbbreviationAction.test.ts b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
index d80a5d31dd0..78dd6c7c3ba 100644
--- a/extensions/emmet/src/test/cssAbbreviationAction.test.ts
+++ b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
@@ -65,6 +65,30 @@ suite('Tests for Expand Abbreviations (CSS)', () => {
 		});
 	});
 
+	test('No emmet when cursor inside comment (CSS)', () => {
+		const testContent = `
+.foo {
+	/*margin: 10px;
+	m10
+	padding: 10px;*/
+	display: auto;
+}
+`;
+
+		return withRandomFileEditor(testContent, 'css', (editor, doc) => {
+			editor.selection = new Selection(3, 4, 3, 4);
+			return expandEmmetAbbreviation(null).then(() => {
+				assert.equal(editor.document.getText(), testContent);
+				const cancelSrc = new CancellationTokenSource();
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+				if (completionPromise) {
+					assert.equal(1, 2, `Invalid completion at property value`);
+				}
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('No emmet when cursor in selector of a rule (CSS)', () => {
 		const testContent = `
 .foo {

From eb7edb6c33db89db71a1198b4c067d48d75b2670 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 26 Mar 2018 21:05:37 -0700
Subject: [PATCH 060/383] Send publisherInfo as new properties for extensions
 from gallery. GDPR

---
 .../common/extensionManagementUtil.ts             | 15 ++++++---------
 .../workbench/api/node/extHostExtensionService.ts |  4 ++--
 .../electron-browser/workbenchThemeService.ts     |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index a1a00bc5cc6..80d5857e87e 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -69,9 +69,6 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		id: getGalleryExtensionIdFromLocal(extension),
 		name: extension.manifest.name,
 		galleryId: null,
-		publisherId: null,
-		publisherName: null,
-		publisherDisplayName: null,
 		dependencies: extension.manifest.extensionDependencies && extension.manifest.extensionDependencies.length > 0
 	};
 }
@@ -82,9 +79,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"name": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"galleryId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		"publisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"publisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+		"galleryPublisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		"galleryPublisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 		"dependencies": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 		"${include}": [
 			"${GalleryExtensionTelemetryData2}"
@@ -96,9 +93,9 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension):
 		id: extension.identifier.id,
 		name: extension.name,
 		galleryId: extension.identifier.uuid,
-		publisherId: extension.publisherId,
-		publisherName: extension.publisher,
-		publisherDisplayName: extension.publisherDisplayName,
+		galleryPublisherId: extension.publisherId,
+		galleryPublisherName: extension.publisher,
+		galleryPublisherDisplayName: extension.publisherDisplayName,
 		dependencies: extension.properties.dependencies.length > 0,
 		...extension.telemetryData
 	};
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 8532e95c37e..7b05b265c8d 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -423,7 +423,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 		"TelemetryActivationEvent" : {
 			"id": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 			"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-			"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+			"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 			"activationEvents": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		}
@@ -431,7 +431,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 	let event = {
 		id: extensionDescription.id,
 		name: extensionDescription.name,
-		publisherDisplayName: extensionDescription.publisher,
+		galleryPublisherDisplayName: extensionDescription.publisher,
 		activationEvents: extensionDescription.activationEvents ? extensionDescription.activationEvents.join(',') : null,
 		isBuiltin: extensionDescription.isBuiltin
 	};
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 238a245d3ce..60ec28900df 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -362,7 +362,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 						"id" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-						"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+						"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"themeId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 					}
 				*/
@@ -370,7 +370,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 					id: themeData.extensionId,
 					name: themeData.extensionName,
 					isBuiltin: themeData.extensionIsBuiltin,
-					publisherDisplayName: themeData.extensionPublisher,
+					galleryPublisherDisplayName: themeData.extensionPublisher,
 					themeId: themeId
 				});
 				this.themeExtensionsActivated.set(key, true);

From 65e502e8eff7f36fa13a02e26adb9c5fbce151ed Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 26 Mar 2018 21:19:35 -0700
Subject: [PATCH 061/383] Remove unused variables

---
 extensions/emmet/src/defaultCompletionProvider.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 57f2d46ea81..fb3d197786e 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node, Stylesheet } from 'EmmetNode';
+import { Stylesheet } from 'EmmetNode';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
-import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument } from './util';
+import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument } from './util';
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 

From 4f806a77c8173b8439ff4ed7026baec0951b33d0 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 27 Mar 2018 09:22:08 +0200
Subject: [PATCH 062/383] Add missing null check (fixes #46617)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index fc2215ead12..34159b6bdc9 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -245,7 +245,9 @@ export class QuickInputService extends Component implements IQuickInputService {
 	}
 
 	protected updateStyles() {
-		this.inputBox.style(this.themeService.getTheme());
+		if (this.inputBox) {
+			this.inputBox.style(this.themeService.getTheme());
+		}
 	}
 }
 

From b918e7a41e744b6ad54d71ce31415c49fef722d0 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 27 Mar 2018 09:29:03 +0200
Subject: [PATCH 063/383] [html] update service

---
 .../html-language-features/server/package.json       |  4 ++--
 extensions/html-language-features/server/yarn.lock   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 021fe43a50a..b8960d8ce5b 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -8,9 +8,9 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.8",
+    "vscode-css-languageservice": "^3.0.9-next.2",
     "vscode-emmet-helper": "1.2.3",
-    "vscode-html-languageservice": "^2.1.1",
+    "vscode-html-languageservice": "^2.1.2",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
     "vscode-languageserver-types": "^3.6.1",
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index 7cabc126d6c..e514ba623dd 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -18,9 +18,9 @@ jsonc-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
 
-vscode-css-languageservice@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.8.tgz#dc27a2f6eefd191bc603be6b9c0a59232a4c2b9f"
+vscode-css-languageservice@^3.0.9-next.2:
+  version "3.0.9-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.2.tgz#04f28bd0dc83be8668375ce9640640287e26b05c"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
@@ -33,9 +33,9 @@ vscode-emmet-helper@1.2.3:
     jsonc-parser "^1.0.0"
     vscode-languageserver-types "^3.6.0-next.1"
 
-vscode-html-languageservice@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.1.tgz#11a4e307f3a983d566313039f99bb37656e86cce"
+vscode-html-languageservice@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.2.tgz#a492d4d3baaa88ce015179f1e985d91eddba9904"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"

From b54c007395b0f0bf713654af6eead3329206db2b Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 27 Mar 2018 09:30:59 +0200
Subject: [PATCH 064/383] [json] update service

---
 extensions/json-language-features/server/package.json | 2 +-
 extensions/json-language-features/server/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index db0d226fb21..caf8c89dbd0 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "jsonc-parser": "^2.0.0-next.1",
     "request-light": "^0.2.2",
-    "vscode-json-languageservice": "^3.0.12",
+    "vscode-json-languageservice": "^3.0.13",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
     "vscode-nls": "^3.2.2",
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
index 1185dbc6a74..9eb398335bb 100644
--- a/extensions/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -68,9 +68,9 @@ request-light@^0.2.2:
     https-proxy-agent "2.1.1"
     vscode-nls "^2.0.2"
 
-vscode-json-languageservice@^3.0.12:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.0.12.tgz#85258632f2f7718028fbdfbb95b4ad009107b821"
+vscode-json-languageservice@^3.0.13:
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.0.13.tgz#dd1b7ddfd4f5ca16e2a7adcc7d7f9009ac02319a"
   dependencies:
     jsonc-parser "^2.0.0-next.1"
     vscode-languageserver-types "^3.6.1"

From e97f9d93458522028d15841f3edee9bcb0aee6a3 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Tue, 27 Mar 2018 09:33:27 +0200
Subject: [PATCH 065/383] debug issues to weinand

---
 .github/classifier.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/classifier.yml b/.github/classifier.yml
index dbdd23ddfb7..572d3c9b40a 100644
--- a/.github/classifier.yml
+++ b/.github/classifier.yml
@@ -10,7 +10,7 @@
         color-picker: [],
         css-less-sass: [ aeschli ],
         debug: {
-            assignees: [ isidorn ],
+            assignees: [ weinand ],
             assignLabel: false
         },
         diff-editor: [],

From 9ba3647569fd07863b7c6bc9ce1ba6b450531ce8 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Tue, 27 Mar 2018 02:39:24 -0500
Subject: [PATCH 066/383] Init folding provider on client ready

---
 .../client/src/cssMain.ts                     | 88 +++++++++++--------
 1 file changed, 49 insertions(+), 39 deletions(-)

diff --git a/extensions/css-language-features/client/src/cssMain.ts b/extensions/css-language-features/client/src/cssMain.ts
index 4c086619f71..22285fb91bf 100644
--- a/extensions/css-language-features/client/src/cssMain.ts
+++ b/extensions/css-language-features/client/src/cssMain.ts
@@ -9,7 +9,7 @@ import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
 import { languages, window, commands, ExtensionContext, Range, Position, TextDocument, CompletionItem, CompletionItemKind, TextEdit, SnippetString, FoldingRangeList, FoldingRange, FoldingContext, CancellationToken } from 'vscode';
-import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient';
+import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Disposable } from 'vscode-languageclient';
 import { FoldingRangesRequest, FoldingRangeRequestParam } from 'vscode-languageserver-protocol-foldingprovider';
 
 // this method is called when vs code is activated
@@ -68,48 +68,58 @@ export function activate(context: ExtensionContext) {
 		indentationRules: indentationRules
 	});
 
-	const regionCompletionRegExpr = /^(\s*)(\/(\*\s*(#\w*)?)?)?$/;
-	languages.registerCompletionItemProvider(documentSelector, {
-		provideCompletionItems(doc, pos) {
-			let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos));
-			let match = lineUntilPos.match(regionCompletionRegExpr);
-			if (match) {
-				let range = new Range(new Position(pos.line, match[1].length), pos);
-				let beginProposal = new CompletionItem('#region', CompletionItemKind.Snippet);
-				beginProposal.range = range; TextEdit.replace(range, '/* #region */');
-				beginProposal.insertText = new SnippetString('/* #region $1*/');
-				beginProposal.documentation = localize('folding.start', 'Folding Region Start');
-				beginProposal.filterText = match[2];
-				beginProposal.sortText = 'za';
-				let endProposal = new CompletionItem('#endregion', CompletionItemKind.Snippet);
-				endProposal.range = range;
-				endProposal.insertText = '/* #endregion */';
-				endProposal.documentation = localize('folding.end', 'Folding Region End');
-				endProposal.sortText = 'zb';
-				endProposal.filterText = match[2];
-				return [beginProposal, endProposal];
-			}
-			return null;
-		}
+	client.onReady().then(() => {
+		context.subscriptions.push(initCompletionProvider());
+		context.subscriptions.push(initFoldingProvider());
 	});
 
-	languages.registerFoldingProvider(documentSelector, {
-		provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-			const param: FoldingRangeRequestParam = {
-				textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
-				maxRanges: context.maxRanges
-			};
-			return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
-				if (res && Array.isArray(res.ranges)) {
-					return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
+	function initCompletionProvider(): Disposable {
+		const regionCompletionRegExpr = /^(\s*)(\/(\*\s*(#\w*)?)?)?$/;
+
+		return languages.registerCompletionItemProvider(documentSelector, {
+			provideCompletionItems(doc, pos) {
+				let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos));
+				let match = lineUntilPos.match(regionCompletionRegExpr);
+				if (match) {
+					let range = new Range(new Position(pos.line, match[1].length), pos);
+					let beginProposal = new CompletionItem('#region', CompletionItemKind.Snippet);
+					beginProposal.range = range; TextEdit.replace(range, '/* #region */');
+					beginProposal.insertText = new SnippetString('/* #region $1*/');
+					beginProposal.documentation = localize('folding.start', 'Folding Region Start');
+					beginProposal.filterText = match[2];
+					beginProposal.sortText = 'za';
+					let endProposal = new CompletionItem('#endregion', CompletionItemKind.Snippet);
+					endProposal.range = range;
+					endProposal.insertText = '/* #endregion */';
+					endProposal.documentation = localize('folding.end', 'Folding Region End');
+					endProposal.sortText = 'zb';
+					endProposal.filterText = match[2];
+					return [beginProposal, endProposal];
 				}
 				return null;
-			}, error => {
-				client.logFailedRequest(FoldingRangesRequest.type, error);
-				return null;
-			});
-		}
-	});
+			}
+		});
+	}
+
+	function initFoldingProvider(): Disposable {
+		return languages.registerFoldingProvider(documentSelector, {
+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
+				const param: FoldingRangeRequestParam = {
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
+					maxRanges: context.maxRanges
+				};
+				return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
+					if (res && Array.isArray(res.ranges)) {
+						return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
+					}
+					return null;
+				}, error => {
+					client.logFailedRequest(FoldingRangesRequest.type, error);
+					return null;
+				});
+			}
+		});
+	}
 
 	commands.registerCommand('_css.applyCodeAction', applyCodeAction);
 

From 1fd4d982b272d01470e3e7bba0b9d0aaeeef229b Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 27 Mar 2018 09:54:57 +0200
Subject: [PATCH 067/383] [css] update service

---
 extensions/css-language-features/server/package.json | 2 +-
 extensions/css-language-features/server/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 80e01d5d01d..20f17fbca1f 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -8,7 +8,7 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.2",
+    "vscode-css-languageservice": "^3.0.9-next.3",
     "vscode-emmet-helper": "^1.2.0",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1"
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index 1d6de3987f7..cd6f5ded1a3 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -18,9 +18,9 @@ jsonc-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
 
-vscode-css-languageservice@^3.0.9-next.2:
-  version "3.0.9-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.2.tgz#04f28bd0dc83be8668375ce9640640287e26b05c"
+vscode-css-languageservice@^3.0.9-next.3:
+  version "3.0.9-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.3.tgz#c6b8baf316d3b87d5896d2694721d6b90ce41c00"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"

From 666e95e8e7f679e23c0e42d86864cba4f2e00025 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 27 Mar 2018 10:44:21 +0200
Subject: [PATCH 068/383] [html] fix compile error with participant

---
 extensions/html-language-features/server/package.json | 2 +-
 extensions/html-language-features/server/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index b8960d8ce5b..d8e22d5d516 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -8,7 +8,7 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.2",
+    "vscode-css-languageservice": "^3.0.8",
     "vscode-emmet-helper": "1.2.3",
     "vscode-html-languageservice": "^2.1.2",
     "vscode-languageserver": "^4.0.0",
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index e514ba623dd..e64ba3def31 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -18,9 +18,9 @@ jsonc-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
 
-vscode-css-languageservice@^3.0.9-next.2:
-  version "3.0.9-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.2.tgz#04f28bd0dc83be8668375ce9640640287e26b05c"
+vscode-css-languageservice@^3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.8.tgz#dc27a2f6eefd191bc603be6b9c0a59232a4c2b9f"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"

From 0a42355840f1e0f1ebd00565dc2b6d47a3b2e98f Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 27 Mar 2018 11:16:38 +0200
Subject: [PATCH 069/383] [css] Request textDocument/foldingRanges failed.
 Fixes #46640

---
 extensions/css-language-features/server/src/cssServerMain.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts
index 693c4384f7f..75223f91b78 100644
--- a/extensions/css-language-features/server/src/cssServerMain.ts
+++ b/extensions/css-language-features/server/src/cssServerMain.ts
@@ -279,10 +279,10 @@ connection.onRenameRequest(renameParameters => {
 
 connection.onRequest(FoldingRangesRequest.type, (params, token) => {
 	return runSafe(() => {
-		let document = documents.get(params[0].textDocument.uri);
+		let document = documents.get(params.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findFoldingRegions(document, stylesheet);
-	}, null, `Error while computing folding ranges for ${params[0].textDocument.uri}`);
+	}, null, `Error while computing folding ranges for ${params.textDocument.uri}`);
 });
 
 // Listen on the connection

From f2b8ab00c4a78afbb56103daa82270aaa1be7291 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Tue, 27 Mar 2018 11:26:58 +0200
Subject: [PATCH 070/383] breakopint widget fix intelisense

fixes #46586
---
 .../electron-browser/breakpointWidget.ts      | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index ec17c5f717c..9a2b023cf55 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -24,7 +24,7 @@ import { ServicesAccessor, EditorCommand, registerEditorCommand } from 'vs/edito
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import uri from 'vs/base/common/uri';
-import { SuggestRegistry, ISuggestResult, SuggestContext, SuggestTriggerKind } from 'vs/editor/common/modes';
+import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITextModel } from 'vs/editor/common/model';
 import { wireCancellationToken } from 'vs/base/common/async';
@@ -143,7 +143,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 
 		this.input.getModel().setValue(this.getInputValue(this.breakpoint));
 		// Due to an electron bug we have to do the timeout, otherwise we do not get focus
-		setTimeout(() => this.input.focus(), 70);
+		setTimeout(() => this.input.focus(), 100);
 	}
 
 	public close(success: boolean): void {
@@ -214,18 +214,26 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 		this.themeService.onThemeChange(() => setDecorations());
 
 		this.toDispose.push(SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
-			triggerCharacters: ['.'],
 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
-				let suggestions: TPromise<ISuggestResult>;
+				let suggestionsPromise: TPromise<ISuggestResult>;
 				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
-					suggestions = provideSuggestionItems(this.editor.getModel(), this.editor.getPosition(), 'none', undefined, { triggerKind: SuggestTriggerKind.Invoke }).then(suggestions => {
-						return { suggestions: suggestions.map(s => s.suggestion) };
+					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(1, 1), 'none', undefined, _context).then(suggestions => {
+						return {
+							suggestions: suggestions.map(s => {
+								if (this.context === Context.CONDITION) {
+									s.suggestion.overwriteBefore = position.column - 1;
+									s.suggestion.overwriteAfter = 0;
+								}
+
+								return s.suggestion;
+							})
+						};
 					});
 				} else {
-					suggestions = TPromise.as({ suggestions: [] });
+					suggestionsPromise = TPromise.as({ suggestions: [] });
 				}
 
-				return wireCancellationToken(token, suggestions);
+				return wireCancellationToken(token, suggestionsPromise);
 			}
 		}));
 	}

From d656cdac7d61c16330520420e57a103697dde16d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 27 Mar 2018 11:50:15 +0200
Subject: [PATCH 071/383] need a break

---
 .github/classifier.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/classifier.yml b/.github/classifier.yml
index 572d3c9b40a..a83c95ad2ba 100644
--- a/.github/classifier.yml
+++ b/.github/classifier.yml
@@ -35,15 +35,15 @@
         error-list: [],
         extensions: [],
         file-encoding: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-io: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-watcher: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-explorer: {
@@ -65,7 +65,7 @@
         markdown: [ mjbvz ],
         merge-conflict: [ chrmarti ],
         multi-root: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         perf-profile: [],
@@ -86,59 +86,59 @@
         themes: [],
         typescript: [ mjbvz ],
         workbench: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-dnd: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-editors: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-electron: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-feedback: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-history: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-layout: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-menu: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-notifications: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-state: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-status: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-tabs: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-title: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-touchbar: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-welcome: [ chrmarti ]

From 4831efe2acc42d5c136340c5f7cd75ec3789efa2 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 27 Mar 2018 12:59:18 +0200
Subject: [PATCH 072/383] Progress API: Can't report 0 progress (fixes #46636)

---
 .../browser/parts/notifications/notificationsViewer.ts      | 6 +++---
 .../workbench/services/progress/browser/progressService2.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 41500cf6f61..2efc994987f 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -468,12 +468,12 @@ export class NotificationTemplateRenderer {
 		}
 
 		// Total / Worked
-		else if (state.total || state.worked) {
-			if (state.total) {
+		else if (typeof state.total === 'number' || typeof state.worked === 'number') {
+			if (typeof state.total === 'number') {
 				this.template.progress.total(state.total);
 			}
 
-			if (state.worked) {
+			if (typeof state.worked === 'number') {
 				this.template.progress.worked(state.worked).getContainer().show();
 			}
 		}
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index 9359d3e0623..4972e385123 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -211,7 +211,7 @@ export class ProgressService2 implements IProgressService2 {
 		};
 
 		const updateProgress = (notification: INotificationHandle, percentage?: number): void => {
-			if (typeof percentage === 'number' && percentage > 0) {
+			if (typeof percentage === 'number' && percentage >= 0) {
 				notification.progress.total(100); // always percentage based
 				notification.progress.worked(percentage);
 			} else {

From 2b1128546441642b8e921a77d3994e52a4aedc78 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 27 Mar 2018 14:37:58 +0200
Subject: [PATCH 073/383] Progress API: Can't create multiple progress
 notifications with the same title (fixes #46637)

---
 src/vs/workbench/common/notifications.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index ebcfc0a44e3..41b614cd182 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -563,6 +563,10 @@ export class NotificationViewItem implements INotificationViewItem {
 	}
 
 	public equals(other: INotificationViewItem): boolean {
+		if (this.hasProgress() || other.hasProgress()) {
+			return false;
+		}
+
 		if (this._source !== other.source) {
 			return false;
 		}

From ab149aba6e4bea1c5b746c4da3f1a0391ddaec6c Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 14:50:05 +0200
Subject: [PATCH 074/383] fixes #21146

---
 extensions/git/package.json               |  3 +-
 extensions/git/src/encoding.ts            | 81 +++++++++++++++++++++++
 extensions/git/src/git.ts                 |  6 +-
 extensions/git/src/repository.ts          | 16 ++---
 extensions/git/src/typings/jschardet.d.ts | 11 +++
 extensions/git/yarn.lock                  |  4 ++
 6 files changed, 108 insertions(+), 13 deletions(-)
 create mode 100644 extensions/git/src/encoding.ts
 create mode 100644 extensions/git/src/typings/jschardet.d.ts

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 8cbc306699a..c4a03271ec2 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1113,6 +1113,7 @@
     "byline": "^5.0.0",
     "file-type": "^7.2.0",
     "iconv-lite": "0.4.19",
+    "jschardet": "^1.6.0",
     "vscode-extension-telemetry": "0.0.15",
     "vscode-nls": "^3.2.1",
     "which": "^1.3.0"
@@ -1125,4 +1126,4 @@
     "@types/which": "^1.0.28",
     "mocha": "^3.2.0"
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/git/src/encoding.ts b/extensions/git/src/encoding.ts
new file mode 100644
index 00000000000..4396105567f
--- /dev/null
+++ b/extensions/git/src/encoding.ts
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as jschardet from 'jschardet';
+
+jschardet.Constants.MINIMUM_THRESHOLD = 0.2;
+
+function detectEncodingByBOM(buffer: NodeBuffer): string | null {
+	if (!buffer || buffer.length < 2) {
+		return null;
+	}
+
+	const b0 = buffer.readUInt8(0);
+	const b1 = buffer.readUInt8(1);
+
+	// UTF-16 BE
+	if (b0 === 0xFE && b1 === 0xFF) {
+		return 'utf16be';
+	}
+
+	// UTF-16 LE
+	if (b0 === 0xFF && b1 === 0xFE) {
+		return 'utf16le';
+	}
+
+	if (buffer.length < 3) {
+		return null;
+	}
+
+	const b2 = buffer.readUInt8(2);
+
+	// UTF-8
+	if (b0 === 0xEF && b1 === 0xBB && b2 === 0xBF) {
+		return 'utf8';
+	}
+
+	return null;
+}
+
+const IGNORE_ENCODINGS = [
+	'ascii',
+	'utf-8',
+	'utf-16',
+	'utf-32'
+];
+
+const JSCHARDET_TO_ICONV_ENCODINGS: { [name: string]: string } = {
+	'ibm866': 'cp866',
+	'big5': 'cp950'
+};
+
+export function detectEncoding(buffer: Buffer): string | null {
+	let result = detectEncodingByBOM(buffer);
+
+	if (result) {
+		return result;
+	}
+
+	const detected = jschardet.detect(buffer);
+
+	if (!detected || !detected.encoding) {
+		return null;
+	}
+
+	const encoding = detected.encoding;
+
+	// Ignore encodings that cannot guess correctly
+	// (http://chardet.readthedocs.io/en/latest/supported-encodings.html)
+	if (0 <= IGNORE_ENCODINGS.indexOf(encoding.toLowerCase())) {
+		return null;
+	}
+
+	const normalizedEncodingName = encoding.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+	const mapped = JSCHARDET_TO_ICONV_ENCODINGS[normalizedEncodingName];
+
+	return mapped || normalizedEncodingName;
+}
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 1ae77fd7072..3ce98482707 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -15,6 +15,7 @@ import iconv = require('iconv-lite');
 import * as filetype from 'file-type';
 import { assign, uniqBy, groupBy, denodeify, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent } from './util';
 import { CancellationToken } from 'vscode';
+import { detectEncoding } from './encoding';
 
 const readfile = denodeify<string, string | null, string>(fs.readFile);
 
@@ -661,7 +662,10 @@ export class Repository {
 
 	async bufferString(object: string, encoding: string = 'utf8'): Promise<string> {
 		const stdout = await this.buffer(object);
-		return iconv.decode(stdout, iconv.encodingExists(encoding) ? encoding : 'utf8');
+		encoding = detectEncoding(stdout) || encoding;
+		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
+
+		return iconv.decode(stdout, encoding);
 	}
 
 	async buffer(object: string): Promise<Buffer> {
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 7586abee7eb..3aa3ac57275 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -811,24 +811,18 @@ export class Repository implements Disposable {
 	}
 
 	async show(ref: string, filePath: string): Promise<string> {
-		return await this.run(Operation.Show, async () => {
+		return this.run(Operation.Show, () => {
 			const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
 			const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
-			const encoding = configFiles.get<string>('encoding');
-
-			// TODO@joao: Resource config api
-			return await this.repository.bufferString(`${ref}:${relativePath}`, encoding);
+			const defaultEncoding = configFiles.get<string>('encoding');
+			return this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding);
 		});
 	}
 
 	async buffer(ref: string, filePath: string): Promise<Buffer> {
-		return await this.run(Operation.Show, async () => {
+		return this.run(Operation.Show, () => {
 			const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
-			// const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
-			// const encoding = configFiles.get<string>('encoding');
-
-			// TODO@joao: REsource config api
-			return await this.repository.buffer(`${ref}:${relativePath}`);
+			return this.repository.buffer(`${ref}:${relativePath}`);
 		});
 	}
 
diff --git a/extensions/git/src/typings/jschardet.d.ts b/extensions/git/src/typings/jschardet.d.ts
new file mode 100644
index 00000000000..9c553b129eb
--- /dev/null
+++ b/extensions/git/src/typings/jschardet.d.ts
@@ -0,0 +1,11 @@
+declare module 'jschardet' {
+	export interface IDetectedMap {
+		encoding: string,
+		confidence: number
+	}
+	export function detect(buffer: NodeBuffer): IDetectedMap;
+
+	export const Constants: {
+		MINIMUM_THRESHOLD: number,
+	}
+}
\ No newline at end of file
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index 747060bcb3f..06a4b992dbb 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -145,6 +145,10 @@ isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
+jschardet@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678"
+
 json3@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"

From 82baa073cc5c6fefc25a22f3cc0eb909bab0a5d0 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 14:53:17 +0200
Subject: [PATCH 075/383] english

---
 src/vs/workbench/parts/update/electron-browser/update.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index e72d54cc255..250de9815d7 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -388,7 +388,7 @@ export class UpdateContribution implements IGlobalActivity {
 
 		const handle = this.notificationService.notify({
 			severity: severity.Info,
-			message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
+			message: nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", product.nameLong),
 			actions: { primary: [applyUpdateAction, NotNowAction, releaseNotesAction] }
 		});
 		once(handle.onDidDispose)(() => applyUpdateAction, releaseNotesAction);

From 64b1b56550097eb889d336a062938f584f7b98ad Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 15:41:17 +0200
Subject: [PATCH 076/383] reduce debounce

---
 src/vs/base/common/decorators.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/common/decorators.ts b/src/vs/base/common/decorators.ts
index 33ea5f02dab..080ac3dc295 100644
--- a/src/vs/base/common/decorators.ts
+++ b/src/vs/base/common/decorators.ts
@@ -62,12 +62,23 @@ export function memoize(target: any, key: string, descriptor: any) {
 	};
 }
 
-export function debounce(delay: number): Function {
+export interface IDebouceReducer<T> {
+	(previousValue: T, ...args: any[]): T;
+}
+
+export function debounce<T>(delay: number, reducer?: IDebouceReducer<T>, initialValue?: T): Function {
 	return createDecorator((fn, key) => {
 		const timerKey = `$debounce$${key}`;
+		let result = initialValue;
 
 		return function (this: any, ...args: any[]) {
 			clearTimeout(this[timerKey]);
+
+			if (reducer) {
+				result = reducer(result, ...args);
+				args = [result];
+			}
+
 			this[timerKey] = setTimeout(() => fn.apply(this, args), delay);
 		};
 	});

From 098cf01a2e35d00206ec29c4e95cfc7d308afdc6 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 27 Mar 2018 16:14:02 +0200
Subject: [PATCH 077/383] Progress API: Can block renderer (fixes #46642)

---
 src/vs/workbench/api/node/extHostProgress.ts | 33 ++++++++++++++------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostProgress.ts b/src/vs/workbench/api/node/extHostProgress.ts
index 07309949af0..3826c76bc3c 100644
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { Progress, ProgressOptions } from 'vscode';
+import { ProgressOptions } from 'vscode';
 import { MainThreadProgressShape, ExtHostProgressShape } from './extHost.protocol';
 import { ProgressLocation } from './extHostTypeConverters';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IProgressStep } from 'vs/platform/progress/common/progress';
+import { IProgressStep, Progress } from 'vs/platform/progress/common/progress';
 import { localize } from 'vs/nls';
 import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
+import { debounce } from 'vs/base/common/decorators';
 
 export class ExtHostProgress implements ExtHostProgressShape {
 
@@ -37,12 +38,6 @@ export class ExtHostProgress implements ExtHostProgressShape {
 			this._mapHandleToCancellationSource.set(handle, source);
 		}
 
-		const progress = {
-			report: (p: IProgressStep) => {
-				this._proxy.$progressReport(handle, p);
-			}
-		};
-
 		const progressEnd = (handle: number): void => {
 			this._proxy.$progressEnd(handle);
 			this._mapHandleToCancellationSource.delete(handle);
@@ -54,7 +49,7 @@ export class ExtHostProgress implements ExtHostProgressShape {
 		let p: Thenable<R>;
 
 		try {
-			p = task(progress, cancellable ? source.token : CancellationToken.None);
+			p = task(new ProgressCallback(this._proxy, handle), cancellable ? source.token : CancellationToken.None);
 		} catch (err) {
 			progressEnd(handle);
 			throw err;
@@ -73,3 +68,23 @@ export class ExtHostProgress implements ExtHostProgressShape {
 	}
 }
 
+function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IProgressStep {
+	result.message = currentValue.message;
+	if (typeof currentValue.percentage === 'number' && typeof result.message === 'number') {
+		result.percentage += currentValue.percentage;
+	} else {
+		result.percentage = currentValue.percentage || result.percentage;
+	}
+	return result;
+}
+
+class ProgressCallback extends Progress<IProgressStep> {
+	constructor(private _proxy: MainThreadProgressShape, private _handle: number) {
+		super(p => this.throttledReport(p));
+	}
+
+	@debounce(100, (result: IProgressStep, currentValue: IProgressStep) => mergeProgress(result, currentValue), Object.create(null))
+	throttledReport(p: IProgressStep): void {
+		this._proxy.$progressReport(this._handle, p);
+	}
+}
\ No newline at end of file

From 8c3d9928a16ef154c47759c0f596c7a43d8ead83 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 16:22:46 +0200
Subject: [PATCH 078/383] Fixes #45479: Use solid borders

---
 .../contrib/wordHighlighter/wordHighlighter.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
index 76dc078f02b..00c39b26a49 100644
--- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -519,15 +519,27 @@ registerThemingParticipant((theme, collector) => {
 	}
 	let selectionHighlightBorder = theme.getColor(editorSelectionHighlightBorder);
 	if (selectionHighlightBorder) {
-		collector.addRule(`.monaco-editor .selectionHighlight { border: 1px dotted ${selectionHighlightBorder}; box-sizing: border-box; }`);
+		if (theme.type === 'hc') {
+			collector.addRule(`.monaco-editor .selectionHighlight { border: 1px dotted ${selectionHighlightBorder}; box-sizing: border-box; }`);
+		} else {
+			collector.addRule(`.monaco-editor .selectionHighlight { border: 1px solid ${selectionHighlightBorder}; box-sizing: border-box; }`);
+		}
 	}
 	let wordHighlightBorder = theme.getColor(editorWordHighlightBorder);
 	if (wordHighlightBorder) {
-		collector.addRule(`.monaco-editor .wordHighlight { border: 1px dashed ${wordHighlightBorder}; box-sizing: border-box; }`);
+		if (theme.type === 'hc') {
+			collector.addRule(`.monaco-editor .wordHighlight { border: 1px dashed ${wordHighlightBorder}; box-sizing: border-box; }`);
+		} else {
+			collector.addRule(`.monaco-editor .wordHighlight { border: 1px solid ${wordHighlightBorder}; box-sizing: border-box; }`);
+		}
 	}
 	let wordHighlightStrongBorder = theme.getColor(editorWordHighlightStrongBorder);
 	if (wordHighlightStrongBorder) {
-		collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px dashed ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
+		if (theme.type === 'hc') {
+			collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px dashed ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
+		} else {
+			collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px solid ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
+		}
 	}
 
 });

From 49b4567a4724524a6f70d2e7447ab2b5606470d1 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 27 Mar 2018 16:05:24 +0200
Subject: [PATCH 079/383] Fix #46539

---
 .../parts/markers/electron-browser/markersTreeViewer.ts    | 7 ++++---
 .../parts/markers/electron-browser/media/markers.css       | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
index bc55f39e66a..55577952d80 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
@@ -205,12 +205,13 @@ export class Renderer implements IRenderer {
 	private renderMarkerElement(tree: ITree, element: Marker, templateData: IMarkerTemplateData) {
 		let marker = element.raw;
 		templateData.icon.className = 'icon ' + Renderer.iconClassNameFor(marker);
+
+		templateData.source.set(marker.source, element.sourceMatches);
+		dom.toggleClass(templateData.source.element, 'marker-source', !!marker.source);
+
 		templateData.description.set(marker.message, element.messageMatches);
 		templateData.description.element.title = marker.message;
 
-		dom.toggleClass(templateData.source.element, 'marker-source', !!marker.source);
-		templateData.source.set(marker.source, element.sourceMatches);
-
 		templateData.lnCol.textContent = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
 	}
 
diff --git a/src/vs/workbench/parts/markers/electron-browser/media/markers.css b/src/vs/workbench/parts/markers/electron-browser/media/markers.css
index ace241621a5..3cf32eb0bcc 100644
--- a/src/vs/workbench/parts/markers/electron-browser/media/markers.css
+++ b/src/vs/workbench/parts/markers/electron-browser/media/markers.css
@@ -71,6 +71,10 @@
 	overflow: hidden;
 }
 
+.markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source {
+	margin-right: 5px;
+}
+
 .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source:before {
 	content: '[';
 }

From 6563a31a3fc982aa3052a7a3149cbd3fe9b6c51c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 27 Mar 2018 17:18:33 +0200
Subject: [PATCH 080/383] progress - fix debouncer initial value

---
 src/vs/base/common/decorators.ts             | 9 ++++++---
 src/vs/workbench/api/node/extHostProgress.ts | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/base/common/decorators.ts b/src/vs/base/common/decorators.ts
index 080ac3dc295..719407fe245 100644
--- a/src/vs/base/common/decorators.ts
+++ b/src/vs/base/common/decorators.ts
@@ -66,10 +66,10 @@ export interface IDebouceReducer<T> {
 	(previousValue: T, ...args: any[]): T;
 }
 
-export function debounce<T>(delay: number, reducer?: IDebouceReducer<T>, initialValue?: T): Function {
+export function debounce<T>(delay: number, reducer?: IDebouceReducer<T>, initialValueProvider?: () => T): Function {
 	return createDecorator((fn, key) => {
 		const timerKey = `$debounce$${key}`;
-		let result = initialValue;
+		let result = initialValueProvider ? initialValueProvider() : void 0;
 
 		return function (this: any, ...args: any[]) {
 			clearTimeout(this[timerKey]);
@@ -79,7 +79,10 @@ export function debounce<T>(delay: number, reducer?: IDebouceReducer<T>, initial
 				args = [result];
 			}
 
-			this[timerKey] = setTimeout(() => fn.apply(this, args), delay);
+			this[timerKey] = setTimeout(() => {
+				fn.apply(this, args);
+				result = initialValueProvider ? initialValueProvider() : void 0;
+			}, delay);
 		};
 	});
 }
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHostProgress.ts b/src/vs/workbench/api/node/extHostProgress.ts
index 3826c76bc3c..b0f1f4d5143 100644
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -83,7 +83,7 @@ class ProgressCallback extends Progress<IProgressStep> {
 		super(p => this.throttledReport(p));
 	}
 
-	@debounce(100, (result: IProgressStep, currentValue: IProgressStep) => mergeProgress(result, currentValue), Object.create(null))
+	@debounce(100, (result: IProgressStep, currentValue: IProgressStep) => mergeProgress(result, currentValue), () => Object.create(null))
 	throttledReport(p: IProgressStep): void {
 		this._proxy.$progressReport(this._handle, p);
 	}

From 9a53b62d5ba9dbeb1e7c9af1e4acef2b41ed9e35 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 15:46:08 +0200
Subject: [PATCH 081/383] fixes #45162

---
 src/vs/workbench/parts/update/electron-browser/update.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 250de9815d7..79eb2e0acce 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -30,6 +30,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ReleaseNotesManager } from './releaseNotesEditor';
 import { once } from 'vs/base/common/event';
+import { isWindows } from 'vs/base/common/platform';
 
 const NotNowAction = new Action(
 	'update.later',
@@ -395,6 +396,10 @@ export class UpdateContribution implements IGlobalActivity {
 	}
 
 	private shouldShowNotification(): boolean {
+		if (isWindows) {
+			return true;
+		}
+
 		const currentVersion = product.commit;
 		const currentMillis = new Date().getTime();
 		const lastKnownVersion = this.storageService.get('update/lastKnownVersion', StorageScope.GLOBAL);

From 4a33a79176a18208ece87540cc9c46d2f4269587 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 15:57:51 +0200
Subject: [PATCH 082/383] fixes #46648

---
 src/vs/base/browser/ui/list/listWidget.ts      | 4 ++--
 src/vs/editor/contrib/suggest/suggestWidget.ts | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index f82c5788fe9..8026e676bdd 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -388,7 +388,7 @@ const DefaultMultipleSelectionContoller = {
 	isSelectionRangeChangeEvent
 };
 
-const DefaultOpenController = {
+const DefaultOpenController: IOpenController = {
 	shouldOpen: (event: UIEvent) => {
 		if (event instanceof MouseEvent) {
 			return !isMouseRightClick(event);
@@ -396,7 +396,7 @@ const DefaultOpenController = {
 
 		return true;
 	}
-} as IOpenController;
+};
 
 class MouseController<T> implements IDisposable {
 
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 4b904459a48..cf433d3dc8a 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -439,7 +439,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		this.list = new List(this.listElement, this, [renderer], {
 			useShadows: false,
 			selectOnMouseDown: true,
-			focusOnMouseDown: false
+			focusOnMouseDown: false,
+			openController: { shouldOpen: () => false }
 		});
 
 		this.toDispose = [

From 6ec243512529c0102e9180133eba706c7c025e35 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 17:21:59 +0200
Subject: [PATCH 083/383] properly dispose tree items

related to #46565
---
 src/vs/base/parts/tree/browser/treeView.ts                   | 5 +++++
 .../parts/files/electron-browser/views/explorerViewer.ts     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts
index 024564b7faa..40ba4f6c093 100644
--- a/src/vs/base/parts/tree/browser/treeView.ts
+++ b/src/vs/base/parts/tree/browser/treeView.ts
@@ -1675,6 +1675,11 @@ export class TreeView extends HeightMap {
 		}
 		this.domNode = null;
 
+		if (this.items) {
+			Object.keys(this.items).forEach(key => this.items[key].removeFromDOM());
+			this.items = null;
+		}
+
 		if (this.context.cache) {
 			this.context.cache.dispose();
 			this.context.cache = null;
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
index 9b412ed7155..60493bdca56 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -226,6 +226,7 @@ export class FileRenderer implements IRenderer {
 	}
 
 	public disposeTemplate(tree: ITree, templateId: string, templateData: IFileTemplateData): void {
+		templateData.elementDisposable.dispose();
 		templateData.label.dispose();
 	}
 

From 502bc4e71d13beab56f24a86915d87a209151517 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 27 Mar 2018 17:23:10 +0200
Subject: [PATCH 084/383] Fix #46352

---
 .../node/extensionManagementService.ts              | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 1eec2f7e57e..736f40fdde6 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -205,7 +205,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 					return this.getDependenciesToInstall(local.manifest.extensionDependencies)
 						.then(dependenciesToInstall => this.downloadAndInstallExtensions(metadata ? dependenciesToInstall.filter(d => d.identifier.uuid !== metadata.id) : dependenciesToInstall))
 						.then(() => local, error => {
-							this.uninstallExtension(local);
+							this.setUninstalled(local);
 							return TPromise.wrapError(new Error(nls.localize('errorInstallingDependencies', "Error while installing dependencies. {0}", error instanceof Error ? error.message : error)));
 						});
 				}
@@ -241,7 +241,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return this.findGalleryExtension(extension)
 			.then(galleryExtension => {
 				if (galleryExtension) {
-					return this.uninstallExtension(extension)
+					return this.setUninstalled(extension)
 						.then(() => this.removeUninstalledExtension(extension)
 							.then(
 								() => this.installFromGallery(galleryExtension),
@@ -449,7 +449,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return this.getInstalled(LocalExtensionType.User)
 			.then(installed =>
 				TPromise.join(installed.filter(local => extensions.some(galleryExtension => local.identifier.id === getLocalExtensionIdFromGallery(galleryExtension, galleryExtension.version))) // Only check id (pub.name-version) because we want to rollback the exact version
-					.map(local => this.uninstallExtension(local))))
+					.map(local => this.setUninstalled(local))))
 			.then(() => null, () => null);
 	}
 
@@ -655,7 +655,9 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private uninstallExtension(local: ILocalExtension): TPromise<void> {
-		return this.setUninstalled(local.identifier.id);
+		// Set all versions of the extension as uninstalled
+		return this.scanUserExtensions(false)
+			.then(userExtensions => this.setUninstalled(...userExtensions.filter(u => areSameExtensions({ id: getGalleryExtensionIdFromLocal(u), uuid: u.identifier.uuid }, { id: getGalleryExtensionIdFromLocal(local), uuid: local.identifier.uuid }))));
 	}
 
 	private async postUninstallExtension(extension: ILocalExtension, error?: string): TPromise<void> {
@@ -791,7 +793,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		});
 	}
 
-	private setUninstalled(...ids: string[]): TPromise<void> {
+	private setUninstalled(...extensions: ILocalExtension[]): TPromise<void> {
+		const ids = extensions.map(e => e.identifier.id);
 		return this.withUninstalledExtensions(uninstalled => assign(uninstalled, ids.reduce((result, id) => { result[id] = true; return result; }, {})));
 	}
 

From 36342196ec557f265bb15044e6ec96f5fbd477b0 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 27 Mar 2018 17:17:46 +0200
Subject: [PATCH 085/383] fix #46650

---
 src/vs/editor/contrib/referenceSearch/referencesWidget.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index 5a1a4c97e27..edf3327d480 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -791,7 +791,7 @@ export class ReferenceWidget extends PeekViewWidget {
 
 		const promise = this._textModelResolverService.createModelReference(reference.uri);
 
-		return TPromise.join([promise, this._tree.reveal(reference)]).then(values => {
+		return TPromise.join([promise, this._tree.reveal(reference, 1)]).then(values => {
 			const ref = values[0];
 
 			if (!this._model) {

From 1a60d699e0e50111e3dd27b40b5fa3b76be44a9c Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 27 Mar 2018 17:25:00 +0200
Subject: [PATCH 086/383] fix #46631

---
 src/vs/editor/contrib/referenceSearch/referencesModel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/referenceSearch/referencesModel.ts b/src/vs/editor/contrib/referenceSearch/referencesModel.ts
index 88880e33a97..81865714ad8 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesModel.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesModel.ts
@@ -261,7 +261,7 @@ export class ReferencesModel implements IDisposable {
 		let childCount = parent.children.length;
 		let groupCount = parent.parent.groups.length;
 
-		if (groupCount === 1 || next && idx + 1 < childCount || !next && idx > 1) {
+		if (groupCount === 1 || next && idx + 1 < childCount || !next && idx > 0) {
 			// cycling within one file
 			if (next) {
 				idx = (idx + 1) % childCount;

From 62e8df331d753a867559a1345bfde5a7238994a8 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 27 Mar 2018 17:31:12 +0200
Subject: [PATCH 087/383] Fix #46307

---
 .../workbench/parts/markers/electron-browser/markersPanel.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index 913ce14a873..fbb6bf0c6ef 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -204,7 +204,10 @@ export class MarkersPanel extends Panel {
 				ariaLabel: Messages.MARKERS_PANEL_ARIA_LABEL_PROBLEMS_TREE
 			});
 
-		Constants.MarkerFocusContextKey.bindTo(this.tree.contextKeyService);
+		const markerFocusContextKey = Constants.MarkerFocusContextKey.bindTo(this.tree.contextKeyService);
+		this._register(this.tree.onDidChangeFocus((e: { focus: any }) => markerFocusContextKey.set(e.focus instanceof Marker)));
+		const focusTracker = this._register(dom.trackFocus(this.tree.getHTMLElement()));
+		this._register(focusTracker.onDidBlur(() => markerFocusContextKey.set(false)));
 
 		const markersNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
 		this._register(debounceEvent(markersNavigator.openResource, (last, event) => event, 75, true)(options => {

From 8f825bbcb59edbcf883ce5d8fdee20f9745332c6 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 27 Mar 2018 17:35:19 +0200
Subject: [PATCH 088/383] Progress can go backwards (fixes #46717)

---
 src/vs/workbench/api/node/extHostProgress.ts                  | 4 ++--
 .../browser/parts/notifications/notificationsViewer.ts        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostProgress.ts b/src/vs/workbench/api/node/extHostProgress.ts
index b0f1f4d5143..ffb4f857c57 100644
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -72,8 +72,8 @@ function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IPro
 	result.message = currentValue.message;
 	if (typeof currentValue.percentage === 'number' && typeof result.message === 'number') {
 		result.percentage += currentValue.percentage;
-	} else {
-		result.percentage = currentValue.percentage || result.percentage;
+	} else if (typeof currentValue.percentage === 'number') {
+		result.percentage = currentValue.percentage;
 	}
 	return result;
 }
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 2efc994987f..2610575458b 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -469,7 +469,7 @@ export class NotificationTemplateRenderer {
 
 		// Total / Worked
 		else if (typeof state.total === 'number' || typeof state.worked === 'number') {
-			if (typeof state.total === 'number') {
+			if (typeof state.total === 'number' && !this.template.progress.hasTotal()) {
 				this.template.progress.total(state.total);
 			}
 

From 66cd43e6b67f420be1aad0c32d2f6140c635a161 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 27 Mar 2018 08:32:43 -0700
Subject: [PATCH 089/383] Fixes #46627

---
 src/vs/code/electron-browser/issue/issueReporterMain.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index aac3ec705b0..4e81aad55a6 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -691,10 +691,14 @@ export class IssueReporter extends Disposable {
 
 	private validateInputs(): boolean {
 		let isValid = true;
-		['issue-title', 'description', 'issue-source', 'extension-selector'].forEach(elementId => {
-			isValid = this.validateInput(elementId) && isValid;
+		['issue-title', 'description', 'issue-source'].forEach(elementId => {
+			isValid = this.validateInput(elementId);
 		});
 
+		if (this.issueReporterModel.getData().fileOnExtension) {
+			isValid = this.validateInput('extension-selector') && isValid;
+		}
+
 		return isValid;
 	}
 

From 7000b9aaac18d91fd3a2bc7c91d039ed1d5c3157 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 17:32:57 +0200
Subject: [PATCH 090/383] fixes #46180

---
 src/vs/base/parts/tree/browser/treeImpl.ts                    | 4 ++--
 src/vs/base/parts/tree/browser/treeView.ts                    | 4 ++--
 .../workbench/parts/markers/electron-browser/markersPanel.ts  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/vs/base/parts/tree/browser/treeImpl.ts
index 42df25ee308..7821495d25d 100644
--- a/src/vs/base/parts/tree/browser/treeImpl.ts
+++ b/src/vs/base/parts/tree/browser/treeImpl.ts
@@ -122,8 +122,8 @@ export class Tree implements _.ITree {
 		return this.view.getHTMLElement();
 	}
 
-	public layout(height?: number): void {
-		this.view.layout(height);
+	public layout(height?: number, width?: number): void {
+		this.view.layout(height, width);
 	}
 
 	public domFocus(): void {
diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts
index 40ba4f6c093..91e59737d7c 100644
--- a/src/vs/base/parts/tree/browser/treeView.ts
+++ b/src/vs/base/parts/tree/browser/treeView.ts
@@ -636,7 +636,7 @@ export class TreeView extends HeightMap {
 		return this.onHiddenScrollTop === null;
 	}
 
-	public layout(height?: number): void {
+	public layout(height?: number, width?: number): void {
 		if (!this.isTreeVisible()) {
 			return;
 		}
@@ -645,7 +645,7 @@ export class TreeView extends HeightMap {
 		this.scrollHeight = this.getContentHeight();
 
 		if (this.horizontalScrolling) {
-			this.viewWidth = DOM.getContentWidth(this.wrapper);
+			this.viewWidth = width || DOM.getContentWidth(this.wrapper);
 		}
 	}
 
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index fbb6bf0c6ef..765a8d04544 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -91,7 +91,7 @@ export class MarkersPanel extends Panel {
 	}
 
 	public layout(dimension: builder.Dimension): void {
-		this.tree.layout(dimension.height);
+		this.tree.layout(dimension.height, dimension.width);
 	}
 
 	public focus(): void {

From 4f4dc86a1226f07d3b4bcef9a6b40dd9b4747998 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 17:35:12 +0200
Subject: [PATCH 091/383] fixes #45806

---
 src/vs/base/browser/ui/list/listView.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index d0931e27a1c..83a76cd7330 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -360,19 +360,22 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 	private toMouseEvent(browserEvent: MouseEvent): IListMouseEvent<T> {
 		const index = this.getItemIndexFromEventTarget(browserEvent.target);
-		const element = index < 0 ? undefined : this.items[index].element;
+		const item = index < 0 ? undefined : this.items[index];
+		const element = item && item.element;
 		return { browserEvent, index, element };
 	}
 
 	private toTouchEvent(browserEvent: TouchEvent): IListTouchEvent<T> {
 		const index = this.getItemIndexFromEventTarget(browserEvent.target);
-		const element = index < 0 ? undefined : this.items[index].element;
+		const item = index < 0 ? undefined : this.items[index];
+		const element = item && item.element;
 		return { browserEvent, index, element };
 	}
 
 	private toGestureEvent(browserEvent: GestureEvent): IListGestureEvent<T> {
 		const index = this.getItemIndexFromEventTarget(browserEvent.initialTarget);
-		const element = index < 0 ? undefined : this.items[index].element;
+		const item = index < 0 ? undefined : this.items[index];
+		const element = item && item.element;
 		return { browserEvent, index, element };
 	}
 

From 118e1445ea027c6df9c66b870bc22f78f5c75a88 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 17:54:31 +0200
Subject: [PATCH 092/383] Fixes #46208: Recover selection from markers when the
 undo/redo stack lacks selection information

---
 src/vs/editor/common/controller/cursor.ts     |  2 +-
 .../common/services/modelServiceImpl.ts       |  7 +--
 .../test/browser/controller/cursor.test.ts    | 58 +++++++++++++++++++
 .../mainThreadSaveParticipant.ts              |  6 +-
 4 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts
index 85045434b1d..25a0704c6f2 100644
--- a/src/vs/editor/common/controller/cursor.ts
+++ b/src/vs/editor/common/controller/cursor.ts
@@ -361,7 +361,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 
 	private _interpretCommandResult(cursorState: Selection[]): void {
 		if (!cursorState || cursorState.length === 0) {
-			return;
+			cursorState = this._cursors.readSelectionFromMarkers();
 		}
 
 		this._columnSelectData = null;
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
index b2dbb1d5720..041cf88e4d6 100644
--- a/src/vs/editor/common/services/modelServiceImpl.ts
+++ b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -13,7 +13,6 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IMarker, IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
 import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
 import { IMode, LanguageIdentifier } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -398,9 +397,9 @@ export class ModelServiceImpl implements IModelService {
 		// Otherwise find a diff between the values and update model
 		model.setEOL(textBuffer.getEOL() === '\r\n' ? EndOfLineSequence.CRLF : EndOfLineSequence.LF);
 		model.pushEditOperations(
-			[new Selection(1, 1, 1, 1)],
+			[],
 			ModelServiceImpl._computeEdits(model, textBuffer),
-			(inverseEditOperations: IIdentifiedSingleEditOperation[]) => [new Selection(1, 1, 1, 1)]
+			(inverseEditOperations: IIdentifiedSingleEditOperation[]) => []
 		);
 	}
 
@@ -451,7 +450,7 @@ export class ModelServiceImpl implements IModelService {
 			newRange = new Range(1, 1, textBufferLineCount, 1 + textBuffer.getLineLength(textBufferLineCount));
 		}
 
-		return [EditOperation.replace(oldRange, textBuffer.getValueInRange(newRange, EndOfLinePreference.TextDefined))];
+		return [EditOperation.replaceMove(oldRange, textBuffer.getValueInRange(newRange, EndOfLinePreference.TextDefined))];
 	}
 
 	public createModel(value: string | ITextBufferFactory, modeOrPromise: TPromise<IMode> | IMode, resource: URI, isForSimpleWidget: boolean = false): ITextModel {
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 9c62c90a5f3..8971ecb0d82 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -1219,6 +1219,64 @@ suite('Editor Controller - Regression tests', () => {
 		model.dispose();
 	});
 
+	test('issue #46208: Allow empty selections in the undo/redo stack', () => {
+		let model = TextModel.createFromString('');
+
+		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
+			cursorCommand(cursor, H.Type, { text: 'Hello' }, 'keyboard');
+			cursorCommand(cursor, H.Type, { text: ' ' }, 'keyboard');
+			cursorCommand(cursor, H.Type, { text: 'world' }, 'keyboard');
+			cursorCommand(cursor, H.Type, { text: ' ' }, 'keyboard');
+			assert.equal(model.getLineContent(1), 'Hello world ');
+			assertCursor(cursor, new Position(1, 13));
+
+			moveLeft(cursor);
+			moveRight(cursor);
+
+			model.pushEditOperations([], [EditOperation.replaceMove(new Range(1, 12, 1, 13), '')], () => []);
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), 'Hello world ');
+			assertCursor(cursor, new Position(1, 13));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), 'Hello');
+			assertCursor(cursor, new Position(1, 6));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), '');
+			assertCursor(cursor, new Position(1, 1));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello');
+			assertCursor(cursor, new Position(1, 6));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world ');
+			assertCursor(cursor, new Position(1, 13));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+		});
+
+		model.dispose();
+	});
+
 	test('bug #16815:Shift+Tab doesn\'t go back to tabstop', () => {
 		let mode = new OnEnterMode(IndentAction.IndentOutdent);
 		let model = TextModel.createFromString(
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index 33b9c3e3239..2dde56fd80b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -50,7 +50,7 @@ class TrimWhitespaceParticipant implements ISaveParticipantParticipant {
 	}
 
 	private doTrimTrailingWhitespace(model: ITextModel, isAutoSaved: boolean): void {
-		let prevSelection: Selection[] = [new Selection(1, 1, 1, 1)];
+		let prevSelection: Selection[] = [];
 		const cursors: Position[] = [];
 
 		let editor = findEditor(model, this.codeEditorService);
@@ -114,7 +114,7 @@ export class FinalNewLineParticipant implements ISaveParticipantParticipant {
 			return;
 		}
 
-		let prevSelection: Selection[] = [new Selection(1, 1, 1, 1)];
+		let prevSelection: Selection[] = [];
 		const editor = findEditor(model, this.codeEditorService);
 		if (editor) {
 			prevSelection = editor.getSelections();
@@ -151,7 +151,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
 			return;
 		}
 
-		let prevSelection: Selection[] = [new Selection(1, 1, 1, 1)];
+		let prevSelection: Selection[] = [];
 		const editor = findEditor(model, this.codeEditorService);
 		if (editor) {
 			prevSelection = editor.getSelections();

From 9651143cf93c356f8877d57e3e8b2ce79b451a99 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 17:57:07 +0200
Subject: [PATCH 093/383] Fix tests

---
 src/vs/editor/test/common/services/modelService.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/test/common/services/modelService.test.ts b/src/vs/editor/test/common/services/modelService.test.ts
index d6f7ab26ce4..fa75cbb9c4f 100644
--- a/src/vs/editor/test/common/services/modelService.test.ts
+++ b/src/vs/editor/test/common/services/modelService.test.ts
@@ -93,7 +93,7 @@ suite('ModelService', () => {
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
 		assert.deepEqual(actual, [
-			EditOperation.replace(new Range(1, 1, 2, 1), 'This is line One\n')
+			EditOperation.replaceMove(new Range(1, 1, 2, 1), 'This is line One\n')
 		]);
 	});
 
@@ -147,7 +147,7 @@ suite('ModelService', () => {
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
 		assert.deepEqual(actual, [
-			EditOperation.replace(
+			EditOperation.replaceMove(
 				new Range(1, 1, 4, 1),
 				[
 					'This is line One',
@@ -182,7 +182,7 @@ suite('ModelService', () => {
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
 		assert.deepEqual(actual, [
-			EditOperation.replace(new Range(3, 2, 3, 2), '\r\n')
+			EditOperation.replaceMove(new Range(3, 2, 3, 2), '\r\n')
 		]);
 	});
 

From 0bd949c012df0081169728c77749a239eef73b62 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 27 Mar 2018 09:04:14 -0700
Subject: [PATCH 094/383] Fix #46628 - wrong "no results found" message

---
 src/vs/workbench/parts/search/browser/searchView.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 89e8cef7800..d40610f8601 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -1108,8 +1108,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			}
 
 			if (!hasResults) {
-				let hasExcludes = !!query.excludePattern;
-				let hasIncludes = !!query.includePattern;
+				const hasExcludes = !!excludePatternText;
+				const hasIncludes = !!includePatternText;
 				let message: string;
 
 				if (!completed) {

From 1b032162a1b9001d08423a3332d098ec25e420b8 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 27 Mar 2018 18:04:34 +0200
Subject: [PATCH 095/383] Fix #46707

---
 .../markers/electron-browser/constants.ts     |  4 ++-
 .../electron-browser/markers.contribution.ts  | 26 +++++++++++++++++--
 .../markers/electron-browser/markersModel.ts  | 13 ++++------
 .../markers/electron-browser/markersPanel.ts  | 11 ++++++--
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/parts/markers/electron-browser/constants.ts b/src/vs/workbench/parts/markers/electron-browser/constants.ts
index b69836eaca0..88d963e3b64 100644
--- a/src/vs/workbench/parts/markers/electron-browser/constants.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/constants.ts
@@ -9,8 +9,10 @@ export default {
 	MARKERS_PANEL_ID: 'workbench.panel.markers',
 	MARKER_COPY_ACTION_ID: 'problems.action.copy',
 	MARKER_COPY_MESSAGE_ACTION_ID: 'problems.action.copyMessage',
+	RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID: 'problems.action.copyRelatedInformationMessage',
 	MARKER_OPEN_SIDE_ACTION_ID: 'problems.action.openToSide',
 	MARKER_SHOW_PANEL_ID: 'workbench.action.showErrorsWarnings',
 
-	MarkerFocusContextKey: new RawContextKey<boolean>('problemFocus', true)
+	MarkerFocusContextKey: new RawContextKey<boolean>('problemFocus', true),
+	RelatedInformationFocusContextKey: new RawContextKey<boolean>('relatedInformationFocus', true)
 };
diff --git a/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts b/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
index 2c1ecca2c3f..789c79ff77b 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
@@ -13,7 +13,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { KeybindingsRegistry, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
-import { Marker } from 'vs/workbench/parts/markers/electron-browser/markersModel';
+import { Marker, RelatedInformation } from 'vs/workbench/parts/markers/electron-browser/markersModel';
 import { MarkersPanel } from 'vs/workbench/parts/markers/electron-browser/markersPanel';
 import { MenuId, MenuRegistry, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
@@ -101,7 +101,7 @@ registerAction({
 });
 registerAction({
 	id: Constants.MARKER_COPY_MESSAGE_ACTION_ID,
-	title: localize('copyMarkerMessage', "Copy Message"),
+	title: localize('copyMessage', "Copy Message"),
 	handler(accessor) {
 		copyMessage(accessor.get(IPanelService));
 	},
@@ -111,6 +111,18 @@ registerAction({
 		group: 'navigation'
 	}
 });
+registerAction({
+	id: Constants.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
+	title: localize('copyMessage', "Copy Message"),
+	handler(accessor) {
+		copyRelatedInformationMessage(accessor.get(IPanelService));
+	},
+	menu: {
+		menuId: MenuId.ProblemsPanelContext,
+		when: Constants.RelatedInformationFocusContextKey,
+		group: 'navigation'
+	}
+});
 
 
 function copyMarker(panelService: IPanelService) {
@@ -133,6 +145,16 @@ function copyMessage(panelService: IPanelService) {
 	}
 }
 
+function copyRelatedInformationMessage(panelService: IPanelService) {
+	const activePanel = panelService.getActivePanel();
+	if (activePanel instanceof MarkersPanel) {
+		const element = (<MarkersPanel>activePanel).getFocusElement();
+		if (element instanceof RelatedInformation) {
+			clipboard.writeText(element.raw.message);
+		}
+	}
+}
+
 interface IActionDescriptor {
 	id: string;
 	handler: ICommandHandler;
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersModel.ts b/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
index d0dbabbde75..2dc945951f8 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
@@ -96,14 +96,11 @@ export class Marker extends NodeWithId {
 	}
 
 	public toString(): string {
-		return [
-			`file: '${this.raw.resource}'`,
-			`severity: '${MarkerSeverity.toString(this.raw.severity)}'`,
-			`message: '${this.raw.message}'`,
-			`at: '${this.raw.startLineNumber},${this.raw.startColumn}'`,
-			`source: '${this.raw.source ? this.raw.source : ''}'`,
-			`code: '${this.raw.code ? this.raw.code : ''}'`
-		].join('\n');
+		return JSON.stringify({
+			...this.raw,
+			resource: this.raw.resource.path,
+			relatedInformation: this.resourceRelatedInformation.length ? this.resourceRelatedInformation.map(r => ({ ...r.raw, resource: r.raw.resource.path })) : void 0
+		}, null, '\t');
 	}
 
 	static compare(a: Marker, b: Marker): number {
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index 765a8d04544..96a071219be 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -205,9 +205,16 @@ export class MarkersPanel extends Panel {
 			});
 
 		const markerFocusContextKey = Constants.MarkerFocusContextKey.bindTo(this.tree.contextKeyService);
-		this._register(this.tree.onDidChangeFocus((e: { focus: any }) => markerFocusContextKey.set(e.focus instanceof Marker)));
+		const relatedInformationFocusContextKey = Constants.RelatedInformationFocusContextKey.bindTo(this.tree.contextKeyService);
+		this._register(this.tree.onDidChangeFocus((e: { focus: any }) => {
+			markerFocusContextKey.set(e.focus instanceof Marker);
+			relatedInformationFocusContextKey.set(e.focus instanceof RelatedInformation);
+		}));
 		const focusTracker = this._register(dom.trackFocus(this.tree.getHTMLElement()));
-		this._register(focusTracker.onDidBlur(() => markerFocusContextKey.set(false)));
+		this._register(focusTracker.onDidBlur(() => {
+			markerFocusContextKey.set(false);
+			relatedInformationFocusContextKey.set(false);
+		}));
 
 		const markersNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
 		this._register(debounceEvent(markersNavigator.openResource, (last, event) => event, 75, true)(options => {

From 6e1f737afce787669c5895747b7d9c8d4ed524fc Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 18:17:57 +0200
Subject: [PATCH 096/383] Simplify FormatCommand (#44870)

---
 src/vs/editor/contrib/format/formatActions.ts |  6 +-
 src/vs/editor/contrib/format/formatCommand.ts | 61 +++++++++++--------
 .../mainThreadSaveParticipant.ts              |  2 +-
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/vs/editor/contrib/format/formatActions.ts b/src/vs/editor/contrib/format/formatActions.ts
index b7801c7b2c2..70145acddb3 100644
--- a/src/vs/editor/contrib/format/formatActions.ts
+++ b/src/vs/editor/contrib/format/formatActions.ts
@@ -161,7 +161,7 @@ class FormatOnType implements editorCommon.IEditorContribution {
 				return;
 			}
 
-			EditOperationsCommand.execute(this.editor, edits, true);
+			EditOperationsCommand.executeAsCommand(this.editor, edits);
 			alertFormattingEdits(edits);
 
 		}, (err) => {
@@ -244,7 +244,7 @@ class FormatOnPaste implements editorCommon.IEditorContribution {
 			if (!state.validate(this.editor) || isFalsyOrEmpty(edits)) {
 				return;
 			}
-			EditOperationsCommand.execute(this.editor, edits, false);
+			EditOperationsCommand.execute(this.editor, edits);
 			alertFormattingEdits(edits);
 		});
 	}
@@ -280,7 +280,7 @@ export abstract class AbstractFormatAction extends EditorAction {
 				return;
 			}
 
-			EditOperationsCommand.execute(editor, edits, false);
+			EditOperationsCommand.execute(editor, edits);
 			alertFormattingEdits(edits);
 			editor.focus();
 		}, err => {
diff --git a/src/vs/editor/contrib/format/formatCommand.ts b/src/vs/editor/contrib/format/formatCommand.ts
index 42f320e538f..0c8cf905e03 100644
--- a/src/vs/editor/contrib/format/formatCommand.ts
+++ b/src/vs/editor/contrib/format/formatCommand.ts
@@ -15,39 +15,48 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
 
 export class EditOperationsCommand implements editorCommon.ICommand {
 
-	static execute(editor: ICodeEditor, edits: TextEdit[], asCommand: boolean) {
-		const cmd = new EditOperationsCommand(edits, editor.getSelection());
-		if (typeof cmd._newEol === 'number') {
-			editor.getModel().setEOL(cmd._newEol);
-		}
-		editor.pushUndoStop();
-		if (!asCommand) {
-			editor.executeEdits('formatEditsCommand', cmd._edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
-		} else {
-			editor.executeCommand('formatEditsCommand', cmd);
-		}
-		editor.pushUndoStop();
-	}
-
-	private _edits: TextEdit[];
-	private _newEol: EndOfLineSequence;
-
-	private _initialSelection: Selection;
-	private _selectionId: string;
-
-	constructor(edits: TextEdit[], initialSelection: Selection) {
-		this._initialSelection = initialSelection;
-		this._edits = [];
-		this._newEol = undefined;
+	static _handleEolEdits(editor: ICodeEditor, edits: TextEdit[]): ISingleEditOperation[] {
+		let newEol: EndOfLineSequence = undefined;
+		let singleEdits: ISingleEditOperation[] = [];
 
 		for (let edit of edits) {
 			if (typeof edit.eol === 'number') {
-				this._newEol = edit.eol;
+				newEol = edit.eol;
 			}
 			if (edit.range && typeof edit.text === 'string') {
-				this._edits.push(edit);
+				singleEdits.push(edit);
 			}
 		}
+
+		if (typeof newEol === 'number') {
+			editor.getModel().setEOL(newEol);
+		}
+
+		return singleEdits;
+	}
+
+	static executeAsCommand(editor: ICodeEditor, _edits: TextEdit[]) {
+		let edits = this._handleEolEdits(editor, _edits);
+		const cmd = new EditOperationsCommand(edits, editor.getSelection());
+		editor.pushUndoStop();
+		editor.executeCommand('formatEditsCommand', cmd);
+		editor.pushUndoStop();
+	}
+
+	static execute(editor: ICodeEditor, _edits: TextEdit[]) {
+		let edits = this._handleEolEdits(editor, _edits);
+		editor.pushUndoStop();
+		editor.executeEdits('formatEditsCommand', edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
+		editor.pushUndoStop();
+	}
+
+	private _edits: ISingleEditOperation[];
+	private _initialSelection: Selection;
+	private _selectionId: string;
+
+	constructor(edits: ISingleEditOperation[], initialSelection: Selection) {
+		this._initialSelection = initialSelection;
+		this._edits = edits;
 	}
 
 	public getEditOperations(model: ITextModel, builder: editorCommon.IEditOperationBuilder): void {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index 2dde56fd80b..631e2d1483a 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -225,7 +225,7 @@ class FormatOnSaveParticipant implements ISaveParticipantParticipant {
 	}
 
 	private _editsWithEditor(editor: ICodeEditor, edits: ISingleEditOperation[]): void {
-		EditOperationsCommand.execute(editor, edits, false);
+		EditOperationsCommand.execute(editor, edits);
 	}
 
 	private _editWithModel(model: ITextModel, edits: ISingleEditOperation[]): void {

From 3f205ed5d7071651e30625c0c2b0cc448e4bd737 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 18:27:50 +0200
Subject: [PATCH 097/383] Fixes #44870: use replace-move semantics to avoid
 expanding selection

---
 src/vs/editor/contrib/format/formatCommand.ts |  2 +-
 .../contrib/format/test/formatCommand.test.ts | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/format/formatCommand.ts b/src/vs/editor/contrib/format/formatCommand.ts
index 0c8cf905e03..52f8d0c428a 100644
--- a/src/vs/editor/contrib/format/formatCommand.ts
+++ b/src/vs/editor/contrib/format/formatCommand.ts
@@ -46,7 +46,7 @@ export class EditOperationsCommand implements editorCommon.ICommand {
 	static execute(editor: ICodeEditor, _edits: TextEdit[]) {
 		let edits = this._handleEolEdits(editor, _edits);
 		editor.pushUndoStop();
-		editor.executeEdits('formatEditsCommand', edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
+		editor.executeEdits('formatEditsCommand', edits.map(edit => EditOperation.replaceMove(Range.lift(edit.range), edit.text)));
 		editor.pushUndoStop();
 	}
 
diff --git a/src/vs/editor/contrib/format/test/formatCommand.test.ts b/src/vs/editor/contrib/format/test/formatCommand.test.ts
index 5b1022fa070..048b9c35b69 100644
--- a/src/vs/editor/contrib/format/test/formatCommand.test.ts
+++ b/src/vs/editor/contrib/format/test/formatCommand.test.ts
@@ -11,6 +11,7 @@ import { ISingleEditOperation } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { EditOperationsCommand } from 'vs/editor/contrib/format/formatCommand';
 import { testCommand } from 'vs/editor/test/browser/testCommand';
+import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 
 function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[]): ISingleEditOperation {
 	return {
@@ -310,4 +311,27 @@ suite('FormatCommand', () => {
 		);
 	});
 
+	test('issue #44870', () => {
+		const initialText = [
+			'[',
+			'    {},{',
+			'    }',
+			']',
+		];
+		withTestCodeEditor(initialText, {}, (editor) => {
+			editor.setSelection(new Selection(2, 8, 2, 8));
+			EditOperationsCommand.execute(editor, [
+				editOp(2, 8, 2, 8, ['', '    ']),
+				editOp(2, 9, 3, 5, ['']),
+			]);
+			assert.equal(editor.getValue(), [
+				'[',
+				'    {},',
+				'    {}',
+				']',
+			].join('\n'));
+			assert.deepEqual(editor.getSelection(), new Selection(3, 5, 3, 5));
+		});
+	});
+
 });

From 3ff0f35fb9428fa19e2375caca4592f84aa2eb44 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Tue, 27 Mar 2018 18:29:32 +0200
Subject: [PATCH 098/383] postDebugTask-schema default value is ''

fixes #46675
---
 src/vs/workbench/parts/debug/node/debugAdapter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/debug/node/debugAdapter.ts b/src/vs/workbench/parts/debug/node/debugAdapter.ts
index 632847907bb..fc2f741c812 100644
--- a/src/vs/workbench/parts/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/parts/debug/node/debugAdapter.ts
@@ -212,12 +212,12 @@ export class Adapter {
 			};
 			properties['preLaunchTask'] = {
 				type: ['string', 'null'],
-				default: null,
+				default: '',
 				description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts.")
 			};
 			properties['postDebugTask'] = {
 				type: ['string', 'null'],
-				default: null,
+				default: '',
 				description: nls.localize('debugPostDebugTask', "Task to run after debug session ends.")
 			};
 			properties['internalConsoleOptions'] = INTERNAL_CONSOLE_OPTIONS_SCHEMA;

From 062f3f732d1189ffa2e12089e8af7ad039e52aff Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 18:33:12 +0200
Subject: [PATCH 099/383] Fixes #46702

---
 src/vs/editor/common/config/editorOptions.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 011cdb3dbf4..bfcb5b080f6 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -1652,7 +1652,11 @@ export class EditorOptionsValidator {
 			renderLineHighlight = _stringSet<'none' | 'gutter' | 'line' | 'all'>(opts.renderLineHighlight, defaults.renderLineHighlight, ['none', 'gutter', 'line', 'all']);
 		}
 
-		const mouseWheelScrollSensitivity = _float(opts.mouseWheelScrollSensitivity, defaults.scrollbar.mouseWheelScrollSensitivity);
+		let mouseWheelScrollSensitivity = _float(opts.mouseWheelScrollSensitivity, defaults.scrollbar.mouseWheelScrollSensitivity);
+		if (mouseWheelScrollSensitivity === 0) {
+			// Disallow 0, as it would prevent/block scrolling
+			mouseWheelScrollSensitivity = 1;
+		}
 		const scrollbar = this._sanitizeScrollbarOpts(opts.scrollbar, defaults.scrollbar, mouseWheelScrollSensitivity);
 		const minimap = this._sanitizeMinimapOpts(opts.minimap, defaults.minimap);
 

From d22af8fbc493932271ed1b84ec2320f0ad992469 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Tue, 27 Mar 2018 18:45:31 +0200
Subject: [PATCH 100/383] fix memoize warning

fixes #46643
---
 src/vs/platform/actions/browser/menuItemActionItem.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index 0c02288e91a..b93c8334898 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -14,7 +14,6 @@ import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { domEvent } from 'vs/base/browser/event';
 import { Emitter } from 'vs/base/common/event';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { memoize } from 'vs/base/common/decorators';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { createCSSRule } from 'vs/base/browser/dom';
 import URI from 'vs/base/common/uri';
@@ -26,6 +25,7 @@ class AlternativeKeyEmitter extends Emitter<boolean> {
 
 	private _subscriptions: IDisposable[] = [];
 	private _isPressed: boolean;
+	private static instance: AlternativeKeyEmitter;
 
 	private constructor(contextMenuService: IContextMenuService) {
 		super();
@@ -49,9 +49,12 @@ class AlternativeKeyEmitter extends Emitter<boolean> {
 		this.fire(this._isPressed);
 	}
 
-	@memoize
 	static getInstance(contextMenuService: IContextMenuService) {
-		return new AlternativeKeyEmitter(contextMenuService);
+		if (!AlternativeKeyEmitter.instance) {
+			AlternativeKeyEmitter.instance = new AlternativeKeyEmitter(contextMenuService);
+		}
+
+		return AlternativeKeyEmitter.instance;
 	}
 
 	dispose() {

From f5b569b63328f27b815b756fca5838fdb7e8521c Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Tue, 27 Mar 2018 09:51:19 -0700
Subject: [PATCH 101/383] Use partial parsing for stylesheets for Emmet command
 #43470

---
 extensions/emmet/src/abbreviationActions.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index dbde92a485e..9e50cc06cde 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { Node, HtmlNode, Rule, Property, Stylesheet } from 'EmmetNode';
-import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode } from './util';
+import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode, parsePartialStylesheet } from './util';
 
 const trimRegex = /[\u00a0]*[\d|#|\-|\*|\u2022]+\.?/;
 const hexColorRegex = /^#\d+$/;
@@ -227,8 +227,12 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 	}
 
 	const editor = vscode.window.activeTextEditor;
-
-	let rootNode = parseDocument(editor.document, false);
+	let rootNode: Node | undefined;
+	if (editor.selections.length === 1 && isStyleSheet(editor.document.languageId) && editor.document.lineCount > 1000) {
+		rootNode = parsePartialStylesheet(editor.document, editor.selection.isReversed ? editor.selection.anchor : editor.selection.active);
+	} else {
+		rootNode = parseDocument(editor.document, false);
+	}
 
 	// When tabbed on a non empty selection, do not treat it as an emmet abbreviation, and fallback to tab instead
 	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true && editor.selections.find(x => !x.isEmpty)) {

From d4f0c640036fcdc118544b74675c9cbd6eac5b2c Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Tue, 27 Mar 2018 19:06:47 +0200
Subject: [PATCH 102/383] explorer: do not react on events if you are disposed

fixes #46565
---
 .../parts/files/electron-browser/views/explorerView.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
index 5ee30960d13..62162c145af 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -227,7 +227,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			this.settings[ExplorerView.MEMENTO_LAST_ACTIVE_FILE_RESOURCE] = activeFile.toString();
 
 			// Select file if input is inside workspace
-			if (this.isVisible() && this.contextService.isInsideWorkspace(activeFile)) {
+			if (this.isVisible() && !this.isDisposed && this.contextService.isInsideWorkspace(activeFile)) {
 				const selection = this.hasSingleSelection(activeFile);
 				if (!selection) {
 					this.select(activeFile).done(null, errors.onUnexpectedError);
@@ -701,7 +701,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	}
 
 	private refreshFromEvent(newRoots: IWorkspaceFolder[] = []): void {
-		if (this.isVisible()) {
+		if (this.isVisible() && !this.isDisposed) {
 			this.explorerRefreshDelayer.trigger(() => {
 				if (!this.explorerViewer.getHighlight()) {
 					return this.doRefresh(newRoots.map(r => r.uri)).then(() => {

From 163b417621c9f01e2957abdcac9b8788afa66f53 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 27 Mar 2018 10:10:12 -0700
Subject: [PATCH 103/383] Handle undefined extension displayName, fixes #46727

---
 src/vs/code/electron-browser/issue/issueReporterMain.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 4e81aad55a6..002a67f39fb 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -771,7 +771,7 @@ export class IssueReporter extends Disposable {
 	}
 
 	private updateExtensionSelector(extensions: ILocalExtension[]): void {
-		const makeOption = (extension: ILocalExtension) => `<option value="${extension.identifier.id}">${escape(extension.manifest.displayName)}</option>`;
+		const makeOption = (extension: ILocalExtension) => `<option value="${extension.identifier.id}">${escape(extension.manifest.displayName || extension.manifest.name || '')}</option>`;
 		const extensionsSelector = document.getElementById('extension-selector');
 		extensionsSelector.innerHTML = '<option></option>' + extensions.map(makeOption).join('\n');
 

From c07abc03f734972dea3fb42019af8bfa5a5bdae0 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Tue, 27 Mar 2018 12:12:22 -0700
Subject: [PATCH 104/383] Avoid parsing file  when abbr is invalid #43470

---
 extensions/emmet/src/defaultCompletionProvider.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index fb3d197786e..98d15f9cdd0 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { Stylesheet } from 'EmmetNode';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
-import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument } from './util';
+import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument, } from './util';
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 
@@ -29,7 +29,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 
 		const helper = getEmmetHelper();
 		const extractAbbreviationResults = helper.extractAbbreviation(document, position, !isStyleSheet(syntax));
-		if (!extractAbbreviationResults) {
+		if (!extractAbbreviationResults || !helper.isAbbreviationValid(syntax, extractAbbreviationResults.abbreviation)) {
 			return;
 		}
 

From c2dc46c1ce92ed2191574046b5286e76cc8eed84 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Tue, 27 Mar 2018 12:28:20 -0700
Subject: [PATCH 105/383] Offset is relative to position when finding comment

---
 extensions/emmet/src/util.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index 8dd1d2d21f5..f0043f6b2db 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -223,7 +223,7 @@ function findClosingCommentAfterPosition(document: vscode.TextDocument, position
 	if (offset === -1) {
 		return;
 	}
-	offset += 2;
+	offset += 2 + document.offsetAt(position);
 	return document.positionAt(offset);
 }
 

From 2a5d7f618c25c7a6540f0ec44655ebade4d7032c Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 27 Mar 2018 22:11:04 +0200
Subject: [PATCH 106/383] Fix tests

---
 .../electron-browser/markersModel.test.ts     | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
index 043b5f9c536..9e2176bb7b6 100644
--- a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
+++ b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
@@ -7,8 +7,8 @@
 
 import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
-import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { MarkersModel, Marker, ResourceMarkers } from 'vs/workbench/parts/markers/electron-browser/markersModel';
+import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
+import { MarkersModel, Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/parts/markers/electron-browser/markersModel';
 
 class TestMarkersModel extends MarkersModel {
 
@@ -139,12 +139,23 @@ suite('MarkersModel Test', () => {
 	});
 
 	test('toString()', function () {
-		const res1Marker = aMarker('a/res1');
-		res1Marker.code = '1234';
-		assert.equal(`file: 'file:///a/res1'\nseverity: 'Error'\nmessage: 'some message'\nat: '10,5'\nsource: 'tslint'\ncode: '1234'`, new Marker('', res1Marker).toString());
-		assert.equal(`file: 'file:///a/res2'\nseverity: 'Warning'\nmessage: 'some message'\nat: '10,5'\nsource: 'tslint'\ncode: ''`, new Marker('', aMarker('a/res2', MarkerSeverity.Warning)).toString());
-		assert.equal(`file: 'file:///a/res2'\nseverity: 'Info'\nmessage: 'Info'\nat: '1,2'\nsource: ''\ncode: ''`, new Marker('', aMarker('a/res2', MarkerSeverity.Info, 1, 2, 1, 8, 'Info', '')).toString());
-		assert.equal(`file: 'file:///a/res2'\nseverity: ''\nmessage: 'Ignore message'\nat: '1,2'\nsource: 'Ignore'\ncode: ''`, new Marker('', aMarker('a/res2', MarkerSeverity.Hint, 1, 2, 1, 8, 'Ignore message', 'Ignore')).toString());
+		let marker = aMarker('a/res1');
+		marker.code = '1234';
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Warning);
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Info, 1, 2, 1, 8, 'Info', '');
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Hint, 1, 2, 1, 8, 'Ignore message', 'Ignore');
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Warning, 1, 2, 1, 8, 'Warning message', '', [{ startLineNumber: 2, startColumn: 5, endLineNumber: 2, endColumn: 10, message: 'some info', resource: URI.file('a/res3') }]);
+		const testObject = new Marker('', marker);
+		testObject.resourceRelatedInformation = marker.relatedInformation.map(r => new RelatedInformation('', r));
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path, relatedInformation: marker.relatedInformation.map(r => ({ ...r, resource: r.resource.path })) }, null, '\t'), testObject.toString());
 	});
 
 	function hasMarker(markers: Marker[], marker: IMarker): boolean {
@@ -200,7 +211,8 @@ suite('MarkersModel Test', () => {
 		endLineNumber: number = startLineNumber + 1,
 		endColumn: number = startColumn + 5,
 		message: string = 'some message',
-		source: string = 'tslint'
+		source: string = 'tslint',
+		relatedInformation?: IRelatedInformation[]
 	): IMarker {
 		return {
 			owner: 'someOwner',
@@ -211,7 +223,8 @@ suite('MarkersModel Test', () => {
 			startColumn,
 			endLineNumber,
 			endColumn,
-			source
+			source,
+			relatedInformation
 		};
 	}
 });

From d62ef8805070855e1fd82a9e58c0ea6b16ffa6f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Tue, 27 Mar 2018 22:34:35 +0200
Subject: [PATCH 107/383] use latest final DAP module

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 17b5ee8a4df..fd5f7ab7af6 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "sudo-prompt": "^8.0.0",
     "v8-inspect-profiler": "^0.0.7",
     "vscode-chokidar": "1.6.2",
-    "vscode-debugprotocol": "1.27.0",
+    "vscode-debugprotocol": "1.28.0",
     "vscode-nsfw": "1.0.17",
     "vscode-ripgrep": "^0.8.1",
     "vscode-textmate": "^3.3.2",
diff --git a/yarn.lock b/yarn.lock
index 611eae8b5b9..10fac872582 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5880,9 +5880,9 @@ vscode-chokidar@1.6.2:
   optionalDependencies:
     vscode-fsevents "0.3.8"
 
-vscode-debugprotocol@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.27.0.tgz#735a43a3cc1235fe587c0ef93fe4e328def7b17c"
+vscode-debugprotocol@1.28.0:
+  version "1.28.0"
+  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.28.0.tgz#b9fb97c3fb2dadbec78e5c1619ff12bf741ce406"
 
 vscode-fsevents@0.3.8:
   version "0.3.8"

From 5fbcfff69a9af92efd823f18e4c9f4b8c4dbdf2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Tue, 27 Mar 2018 22:35:46 +0200
Subject: [PATCH 108/383] node-debug@1.22.10

---
 build/builtInExtensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index baea135199c..14291af04de 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.22.9",
+		"version": "1.22.10",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{

From f9faca3fbb2f3bf085366a70289e5d7a38b23816 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 23:08:35 +0200
Subject: [PATCH 109/383] Fixes #46455: Restore logical viewport when edits
 occur in another editor

---
 src/vs/editor/browser/view/viewImpl.ts        |  1 +
 src/vs/editor/common/model.ts                 |  6 +++++
 src/vs/editor/common/model/textModel.ts       |  4 +++
 src/vs/editor/common/viewModel/viewModel.ts   |  1 +
 .../editor/common/viewModel/viewModelImpl.ts  | 27 ++++++++++++++++++-
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
index 88fa7e2ed2d..22de5aae513 100644
--- a/src/vs/editor/browser/view/viewImpl.ts
+++ b/src/vs/editor/browser/view/viewImpl.ts
@@ -321,6 +321,7 @@ export class View extends ViewEventHandler {
 	}
 	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this.domNode.setClassName(this.getEditorClassName());
+		this._context.model.setHasFocus(e.isFocused);
 		if (e.isFocused) {
 			this.outgoingEvents.emitViewFocusGained();
 		} else {
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 4dc552e92d2..a4b31bd392e 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -1067,6 +1067,12 @@ export interface ITextModel {
 	 * @internal
 	 */
 	isAttachedToEditor(): boolean;
+
+	/**
+	 * Returns the count of editors this model is attached to.
+	 * @internal
+	 */
+	getAttachedEditorCount(): number;
 }
 
 /**
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 9dc2d0e38f8..c3881ab2db5 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -551,6 +551,10 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return this._attachedEditorCount > 0;
 	}
 
+	public getAttachedEditorCount(): number {
+		return this._attachedEditorCount;
+	}
+
 	public isTooLargeForHavingARichMode(): boolean {
 		return this._shouldSimplifyMode;
 	}
diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts
index c3b771d2c31..3dc65ee071a 100644
--- a/src/vs/editor/common/viewModel/viewModel.ts
+++ b/src/vs/editor/common/viewModel/viewModel.ts
@@ -122,6 +122,7 @@ export interface IViewModel {
 	 * Gives a hint that a lot of requests are about to come in for these line numbers.
 	 */
 	setViewport(startLineNumber: number, endLineNumber: number, centeredLineNumber: number): void;
+	setHasFocus(hasFocus: boolean): void;
 
 	getDecorationsInViewport(visibleRange: Range): ViewModelDecoration[];
 	getViewLineRenderingData(visibleRange: Range, lineNumber: number): ViewLineRenderingData;
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 6c8176bf41b..cdde76ac955 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -23,7 +23,7 @@ import { Color } from 'vs/base/common/color';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ITheme } from 'vs/platform/theme/common/themeService';
 import { ModelDecorationOverviewRulerOptions } from 'vs/editor/common/model/textModel';
-import { ITextModel, EndOfLinePreference } from 'vs/editor/common/model';
+import { ITextModel, EndOfLinePreference, TrackedRangeStickiness } from 'vs/editor/common/model';
 
 const USE_IDENTITY_LINES_COLLECTION = true;
 
@@ -32,6 +32,9 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 	private readonly editorId: number;
 	private readonly configuration: editorCommon.IConfiguration;
 	private readonly model: ITextModel;
+	private hasFocus: boolean;
+	private viewportStartLineTrackedRange: string;
+	private viewportStartLineTop: number;
 	private readonly lines: IViewModelLinesCollection;
 	public readonly coordinatesConverter: ICoordinatesConverter;
 	public readonly viewLayout: ViewLayout;
@@ -46,6 +49,9 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		this.editorId = editorId;
 		this.configuration = configuration;
 		this.model = model;
+		this.hasFocus = false;
+		this.viewportStartLineTrackedRange = null;
+		this.viewportStartLineTop = 0;
 
 		if (USE_IDENTITY_LINES_COLLECTION && this.model.isTooLargeForTokenization()) {
 
@@ -114,6 +120,11 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		super.dispose();
 		this.decorations.dispose();
 		this.lines.dispose();
+		this.viewportStartLineTrackedRange = this.model._setTrackedRange(this.viewportStartLineTrackedRange, null, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+	}
+
+	public setHasFocus(hasFocus: boolean): void {
+		this.hasFocus = hasFocus;
 	}
 
 	private _onConfigurationChanged(eventsCollector: viewEvents.ViewEventsCollector, e: IConfigurationChangedEvent): void {
@@ -238,6 +249,16 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 			// Update the configuration and reset the centered view line
 			this._centeredViewLine = -1;
 			this.configuration.setMaxLineNumber(this.model.getLineCount());
+
+			// Recover viewport
+			if (!this.hasFocus && this.model.getAttachedEditorCount() >= 2 && this.viewportStartLineTrackedRange) {
+				const modelRange = this.model._getTrackedRange(this.viewportStartLineTrackedRange);
+				if (modelRange) {
+					const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(modelRange.getStartPosition());
+					const viewPositionTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber);
+					this.viewLayout.deltaScrollNow(0, viewPositionTop - this.viewportStartLineTop);
+				}
+			}
 		}));
 
 		this._register(this.model.onDidChangeTokens((e) => {
@@ -402,6 +423,10 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 	public setViewport(startLineNumber: number, endLineNumber: number, centeredLineNumber: number): void {
 		this._centeredViewLine = centeredLineNumber;
 		this.lines.warmUpLookupCache(startLineNumber, endLineNumber);
+
+		let position = this.coordinatesConverter.convertViewPositionToModelPosition(new Position(startLineNumber, this.getLineMinColumn(startLineNumber)));
+		this.viewportStartLineTrackedRange = this.model._setTrackedRange(this.viewportStartLineTrackedRange, new Range(position.lineNumber, position.column, position.lineNumber, position.column), TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+		this.viewportStartLineTop = this.viewLayout.getVerticalOffsetForLineNumber(startLineNumber);
 	}
 
 	public getLinesIndentGuides(startLineNumber: number, endLineNumber: number): number[] {

From ddd967559b69ce77932c234f4b6d967120724a7e Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 27 Mar 2018 13:51:06 -0700
Subject: [PATCH 110/383] Pick up TS 2.8.1

---
 extensions/package.json | 2 +-
 extensions/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/package.json b/extensions/package.json
index 76e6cdf5cd7..efc4da072e5 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.8.0-insiders.20180320"
+    "typescript": "2.8.1"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 08072f51476..9775a3e7210 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-typescript@2.8.0-insiders.20180320:
-  version "2.8.0-insiders.20180320"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.0-insiders.20180320.tgz#30fb1dd0230a271a9b174820feafdc9d8da2497d"
+typescript@2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"

From c059826ba241273ec9c4213687b18089f1b0c2cf Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 27 Mar 2018 14:33:34 -0700
Subject: [PATCH 111/383] Have distinct js/ts commands for organize imports

Fixes #46701
---
 .../typescript-language-features/package.json | 19 ++++++++++++++++++-
 .../src/features/organizeImports.ts           |  5 +++--
 .../src/utils/commandManager.ts               |  6 ++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index ca8c919f1ba..e4b92c6fa46 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -468,6 +468,11 @@
         "command": "typescript.organizeImports",
         "title": "%typescript.organizeImports%",
         "category": "TypeScript"
+      },
+      {
+        "command": "javascript.organizeImports",
+        "title": "%typescript.organizeImports%",
+        "category": "JavaScript"
       }
     ],
     "keybindings": [
@@ -525,7 +530,19 @@
         },
         {
           "command": "typescript.organizeImports",
-          "when": "typescript.isManagedFile && typescript.canOrganizeImports"
+          "when": "editorLangId == typescriptreact && typescript.isManagedFile && typescript.canOrganizeImports"
+        },
+        {
+          "command": "typescript.organizeImports",
+          "when": "editorLangId == typescript && typescript.isManagedFile && typescript.canOrganizeImports"
+        },
+        {
+          "command": "javascript.organizeImports",
+          "when": "editorLangId == javascriptreact && typescript.isManagedFile && typescript.canOrganizeImports"
+        },
+        {
+          "command": "javascript.organizeImports",
+          "when": "editorLangId == javascript && typescript.isManagedFile && typescript.canOrganizeImports"
         }
       ]
     },
diff --git a/extensions/typescript-language-features/src/features/organizeImports.ts b/extensions/typescript-language-features/src/features/organizeImports.ts
index 3f53aa29f1a..a92aabc9f9f 100644
--- a/extensions/typescript-language-features/src/features/organizeImports.ts
+++ b/extensions/typescript-language-features/src/features/organizeImports.ts
@@ -15,8 +15,9 @@ import { Lazy } from '../utils/lazy';
 import TypeScriptServiceClientHost from '../typeScriptServiceClientHost';
 
 export class OrganizeImportsCommand implements Command {
-	public static readonly ID = 'typescript.organizeImports';
-	public readonly id = OrganizeImportsCommand.ID;
+	public static readonly Ids = ['javascript.organizeImports', 'typescript.organizeImports'];
+
+	public readonly id = OrganizeImportsCommand.Ids;
 
 	constructor(
 		private readonly lazyClientHost: Lazy<TypeScriptServiceClientHost>
diff --git a/extensions/typescript-language-features/src/utils/commandManager.ts b/extensions/typescript-language-features/src/utils/commandManager.ts
index 359d5b9ca96..7bf1d7e33aa 100644
--- a/extensions/typescript-language-features/src/utils/commandManager.ts
+++ b/extensions/typescript-language-features/src/utils/commandManager.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 
 export interface Command {
-	readonly id: string;
+	readonly id: string | string[];
 
 	execute(...args: any[]): void;
 }
@@ -22,7 +22,9 @@ export class CommandManager {
 	}
 
 	public register<T extends Command>(command: T): T {
-		this.registerCommand(command.id, command.execute, command);
+		for (const id of Array.isArray(command.id) ? command.id : [command.id]) {
+			this.registerCommand(id, command.execute, command);
+		}
 		return command;
 	}
 

From 1374fa6aa7df492b667e5c3c7ffd5e7f025b97e4 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 27 Mar 2018 23:37:30 +0200
Subject: [PATCH 112/383] Fixes #46440: Distribute multiline paste to
 multicursors

---
 .../common/controller/cursorTypeOperations.ts | 10 ++++
 .../test/browser/controller/cursor.test.ts    | 48 +++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/src/vs/editor/common/controller/cursorTypeOperations.ts b/src/vs/editor/common/controller/cursorTypeOperations.ts
index 320f1f8b9c2..12077751e66 100644
--- a/src/vs/editor/common/controller/cursorTypeOperations.ts
+++ b/src/vs/editor/common/controller/cursorTypeOperations.ts
@@ -18,6 +18,7 @@ import { IndentAction, EnterAction } from 'vs/editor/common/modes/languageConfig
 import { SurroundSelectionCommand } from 'vs/editor/common/commands/surroundSelectionCommand';
 import { IElectricAction } from 'vs/editor/common/modes/supports/electricCharacter';
 import { getMapForWordSeparators, WordCharacterClass } from 'vs/editor/common/controller/wordCharacterClassifier';
+import { CharCode } from 'vs/base/common/charCode';
 
 export class TypeOperations {
 
@@ -123,6 +124,15 @@ export class TypeOperations {
 			return multicursorText;
 		}
 
+		// Remove trailing \n if present
+		if (text.charCodeAt(text.length - 1) === CharCode.LineFeed) {
+			text = text.substr(0, text.length - 1);
+		}
+		let lines = text.split(/\r\n|\r|\n/);
+		if (lines.length === selections.length) {
+			return lines;
+		}
+
 		return null;
 	}
 
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 8971ecb0d82..296051b8ef3 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -1550,6 +1550,54 @@ suite('Editor Controller - Regression tests', () => {
 		});
 	});
 
+	test('issue #46440: (1) Pasting a multi-line selection pastes entire selection into every insertion point', () => {
+		usingCursor({
+			text: [
+				'line1',
+				'line2',
+				'line3'
+			],
+		}, (model, cursor) => {
+			cursor.setSelections('test', [new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1), new Selection(3, 1, 3, 1)]);
+
+			cursorCommand(cursor, H.Paste, {
+				text: 'a\nb\nc',
+				pasteOnNewLine: false,
+				multicursorText: null
+			});
+
+			assert.equal(model.getValue(), [
+				'aline1',
+				'bline2',
+				'cline3'
+			].join('\n'));
+		});
+	});
+
+	test('issue #46440: (2) Pasting a multi-line selection pastes entire selection into every insertion point', () => {
+		usingCursor({
+			text: [
+				'line1',
+				'line2',
+				'line3'
+			],
+		}, (model, cursor) => {
+			cursor.setSelections('test', [new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1), new Selection(3, 1, 3, 1)]);
+
+			cursorCommand(cursor, H.Paste, {
+				text: 'a\nb\nc\n',
+				pasteOnNewLine: false,
+				multicursorText: null
+			});
+
+			assert.equal(model.getValue(), [
+				'aline1',
+				'bline2',
+				'cline3'
+			].join('\n'));
+		});
+	});
+
 	test('issue #3071: Investigate why undo stack gets corrupted', () => {
 		let model = TextModel.createFromString(
 			[

From 451372e82b5d5e988db0c52df89de5106c24827b Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Tue, 27 Mar 2018 14:59:06 -0700
Subject: [PATCH 113/383] Add old properties back until we retire them post
 nova

---
 .../extensionManagement/common/extensionManagementUtil.ts   | 6 ++++++
 src/vs/workbench/api/node/extHostExtensionService.ts        | 2 ++
 .../themes/electron-browser/workbenchThemeService.ts        | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 80d5857e87e..54fcf01e4d9 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -79,6 +79,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"name": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"galleryId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherId": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+		"publisherName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+		"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
 		"galleryPublisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 		"galleryPublisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 		"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
@@ -93,6 +96,9 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension):
 		id: extension.identifier.id,
 		name: extension.name,
 		galleryId: extension.identifier.uuid,
+		publisherId: extension.publisherId,
+		publisherName: extension.publisher,
+		publisherDisplayName: extension.publisherDisplayName,
 		galleryPublisherId: extension.publisherId,
 		galleryPublisherName: extension.publisher,
 		galleryPublisherDisplayName: extension.publisherDisplayName,
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 7b05b265c8d..949c69abdca 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -423,6 +423,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 		"TelemetryActivationEvent" : {
 			"id": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 			"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+			"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
 			"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 			"activationEvents": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -431,6 +432,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 	let event = {
 		id: extensionDescription.id,
 		name: extensionDescription.name,
+		publisherDisplayName: extensionDescription.publisher,
 		galleryPublisherDisplayName: extensionDescription.publisher,
 		activationEvents: extensionDescription.activationEvents ? extensionDescription.activationEvents.join(',') : null,
 		isBuiltin: extensionDescription.isBuiltin
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 60ec28900df..9c91aa72e6f 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -362,6 +362,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 						"id" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+						"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
 						"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"themeId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 					}
@@ -370,6 +371,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 					id: themeData.extensionId,
 					name: themeData.extensionName,
 					isBuiltin: themeData.extensionIsBuiltin,
+					publisherDisplayName: themeData.extensionPublisher,
 					galleryPublisherDisplayName: themeData.extensionPublisher,
 					themeId: themeId
 				});

From 7f8c3f68f33c67b431f4850a9f49f2b23451ec81 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 27 Mar 2018 15:26:11 -0700
Subject: [PATCH 114/383] Fixes #46775

---
 src/vs/code/electron-browser/issue/issueReporterMain.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 002a67f39fb..83392e33bd6 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -692,7 +692,7 @@ export class IssueReporter extends Disposable {
 	private validateInputs(): boolean {
 		let isValid = true;
 		['issue-title', 'description', 'issue-source'].forEach(elementId => {
-			isValid = this.validateInput(elementId);
+			isValid = this.validateInput(elementId) && isValid;
 		});
 
 		if (this.issueReporterModel.getData().fileOnExtension) {

From 2f8d4ea055e0c6f0883a626c30df6f2b720b3953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Wed, 28 Mar 2018 00:52:28 +0200
Subject: [PATCH 115/383] node-debug@1.22.11

---
 build/builtInExtensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 14291af04de..ddd3c9e44be 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.22.10",
+		"version": "1.22.11",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{

From 5bf4195cc7d6b3273e15399a5ed77fd268520c09 Mon Sep 17 00:00:00 2001
From: SteVen Batten <stbatt@microsoft.com>
Date: Tue, 27 Mar 2018 16:54:19 -0700
Subject: [PATCH 116/383] updating wording for large file error fixes #46748

---
 .../workbench/parts/files/browser/editors/textFileEditor.ts | 4 ++--
 .../parts/files/electron-browser/files.contribution.ts      | 2 +-
 src/vs/workbench/services/files/node/fileService.ts         | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 05f2bfad02c..3c1a0643cb9 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -175,14 +175,14 @@ export class TextFileEditor extends BaseTextEditor {
 
 					return TPromise.wrapError<void>(errors.create(toErrorMessage(error), {
 						actions: [
-							new Action('workbench.window.action.relaunchWithIncreasedMemoryLimit', nls.localize('relaunchWithIncreasedMemoryLimit', "Relaunch"), null, true, () => {
+							new Action('workbench.window.action.relaunchWithIncreasedMemoryLimit', nls.localize('relaunchWithIncreasedMemoryLimit', "Restart with {0} MB", memoryLimit), null, true, () => {
 								return this.windowsService.relaunch({
 									addArgs: [
 										`--max-memory=${memoryLimit}`
 									]
 								});
 							}),
-							new Action('workbench.window.action.configureMemoryLimit', nls.localize('configureMemoryLimit', 'Configure'), null, true, () => {
+							new Action('workbench.window.action.configureMemoryLimit', nls.localize('configureMemoryLimit', 'Configure Memory Limit'), null, true, () => {
 								return this.preferencesService.openGlobalSettings().then(editor => {
 									if (editor instanceof PreferencesEditor) {
 										editor.focusSearch('files.maxMemoryForLargeFilesMB');
diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
index 69e208012e1..0560e016583 100644
--- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
@@ -286,7 +286,7 @@ configurationRegistry.registerConfiguration({
 		'files.maxMemoryForLargeFilesMB': {
 			'type': 'number',
 			'default': 4096,
-			'description': nls.localize('maxMemoryForLargeFilesMB', "The new limit on memory in MB to be used by the application when relaunching to open large files. If you wish to start with a higher limit, you can launch the application from command line with --max-memory=NEWSIZE.")
+			'description': nls.localize('maxMemoryForLargeFilesMB', "Controls the memory available to VS Code after restart when trying to open large files. Same affect as specifying --max-memory=NEWSIZE on the command line.")
 		}
 	}
 });
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
index 873c0914b1e..d0e3b80b305 100644
--- a/src/vs/workbench/services/files/node/fileService.ts
+++ b/src/vs/workbench/services/files/node/fileService.ts
@@ -318,9 +318,8 @@ export class FileService implements IFileService {
 			// Return early if file is too large to load
 			if (typeof stat.size === 'number') {
 				if (stat.size > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
-					let memoryLimit = this.textResourceConfigurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') | 4096;
 					return onStatError(new FileOperationError(
-						nls.localize('fileTooLargeForHeapError', "File size exceeds the default memory limit. Relaunch with a higher limit. The current setting is configured to relaunch with {0}MB", memoryLimit),
+						nls.localize('fileTooLargeForHeapError', "To open a file of this size, you need to restart VS Code and allow it to use more memory"),
 						FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
 					));
 				}
@@ -469,9 +468,8 @@ export class FileService implements IFileService {
 						}
 
 						if (totalBytesRead > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
-							let memoryLimit = this.textResourceConfigurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') | 4096;
 							finish(new FileOperationError(
-								nls.localize('fileTooLargeForHeapError', "File size exceeds the default memory limit. Relaunch with a higher limit. The current setting is configured to relaunch with {0}MB", memoryLimit),
+								nls.localize('fileTooLargeForHeapError', "To open a file of this size, you need to restart VS Code and allow it to use more memory"),
 								FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
 							));
 						}

From 41bc888293b4ca6fce252bc9f69afb8e99ae6ac4 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 27 Mar 2018 17:15:39 -0700
Subject: [PATCH 117/383] Use 'bugs' url if present, fixes #46773

---
 .../issue/issueReporterMain.ts                | 15 ++++++++--
 .../issue/issueReporterUtil.ts                | 30 +++++++++++++++++++
 .../issue/test/testReporterModel.test.ts      | 15 ++++++++++
 .../common/extensionManagement.ts             |  3 ++
 4 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 src/vs/code/electron-browser/issue/issueReporterUtil.ts

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 83392e33bd6..c0539a469d7 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -40,6 +40,7 @@ import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
 import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import { normalizeGitHubIssuesUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
 
 const MAX_URL_LENGTH = platform.isWindows ? 2081 : 5400;
 
@@ -440,6 +441,11 @@ export class IssueReporter extends Disposable {
 		return selectedExtension && selectedExtension.manifest && selectedExtension.manifest.repository && selectedExtension.manifest.repository.url;
 	}
 
+	private getExtensionBugsUrl(): string {
+		const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+		return selectedExtension && selectedExtension.manifest && selectedExtension.manifest.bugs && selectedExtension.manifest.bugs.url;
+	}
+
 	private searchVSCodeIssues(title: string, issueDescription: string): void {
 		if (title || issueDescription) {
 			this.searchDuplicates(title, issueDescription);
@@ -746,10 +752,13 @@ export class IssueReporter extends Disposable {
 	private getIssueUrlWithTitle(issueTitle: string): string {
 		let repositoryUrl = product.reportIssueUrl;
 		if (this.issueReporterModel.getData().fileOnExtension) {
+			const bugsUrl = this.getExtensionBugsUrl();
 			const extensionUrl = this.getExtensionRepositoryUrl();
-			if (extensionUrl) {
-				// Remove '.git' suffix
-				repositoryUrl = `${extensionUrl.indexOf('.git') !== -1 ? extensionUrl.substr(0, extensionUrl.length - 4) : extensionUrl}/issues/new/`;
+			// If given, try to match the extension's bug url
+			if (bugsUrl && bugsUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
+				repositoryUrl = normalizeGitHubIssuesUrl(bugsUrl);
+			} else if (extensionUrl && extensionUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
+				repositoryUrl = normalizeGitHubIssuesUrl(extensionUrl);
 			}
 		}
 
diff --git a/src/vs/code/electron-browser/issue/issueReporterUtil.ts b/src/vs/code/electron-browser/issue/issueReporterUtil.ts
new file mode 100644
index 00000000000..2212eaf002c
--- /dev/null
+++ b/src/vs/code/electron-browser/issue/issueReporterUtil.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { endsWith, rtrim } from 'vs/base/common/strings';
+
+export function normalizeGitHubIssuesUrl(url: string): string {
+	// If the url has a .git suffix, remove it
+	if (endsWith(url, '.git')) {
+		url = url.substr(0, url.length - 4);
+	}
+
+	// Remove trailing slash
+	url = rtrim(url, '/');
+
+	// If the url already ends with issues/new, it's beautiful, return it
+	if (endsWith(url, 'issues/new')) {
+		return url;
+	}
+
+	// Add new segment if it does not exist
+	if (endsWith(url, 'issues')) {
+		return url + '/new';
+	}
+
+	return url + '/issues/new';
+}
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
index 24cc0c7731e..34c7c07e8a5 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -7,6 +7,7 @@
 
 import * as assert from 'assert';
 import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
+import { normalizeGitHubIssuesUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
 
 suite('IssueReporter', () => {
 
@@ -36,4 +37,18 @@ OS version: undefined
 
 <!-- generated by issue reporter -->`);
 	});
+
+	test('should normalize GitHub urls', () => {
+		[
+			'https://github.com/repo',
+			'https://github.com/repo/',
+			'https://github.com/repo.git',
+			'https://github.com/repo/issues',
+			'https://github.com/repo/issues/',
+			'https://github.com/repo/issues/new',
+			'https://github.com/repo/issues/new/'
+		].forEach(url => {
+			assert.equal('https://github.com/repo/issues/new', normalizeGitHubIssuesUrl(url));
+		});
+	});
 });
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 82d0cc35551..973f0262d75 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -120,6 +120,9 @@ export interface IExtensionManifest {
 	repository?: {
 		url: string;
 	};
+	bugs?: {
+		url: string;
+	};
 }
 
 export interface IGalleryExtensionProperties {

From 7cf6969bd0e3877dacd206d92d820043dfdcb0c7 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Tue, 27 Mar 2018 17:17:08 -0700
Subject: [PATCH 118/383] Absorb upstream fix for #45790

---
 extensions/css-language-features/server/package.json  | 2 +-
 extensions/css-language-features/server/yarn.lock     | 6 +++---
 extensions/emmet/package.json                         | 2 +-
 extensions/emmet/yarn.lock                            | 6 +++---
 extensions/html-language-features/server/package.json | 2 +-
 extensions/html-language-features/server/yarn.lock    | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 20f17fbca1f..88ed441a3ed 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^3.0.9-next.3",
-    "vscode-emmet-helper": "^1.2.0",
+    "vscode-emmet-helper": "^1.2.4",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1"
   },
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index cd6f5ded1a3..8ce04e915c9 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.9-next.3:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
 
-vscode-emmet-helper@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.0.tgz#6b9311be065c9c99d5de2dae18ea0730d9cfb734"
+vscode-emmet-helper@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.4.tgz#48056974d13036722af019235b9f750a495de728"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index c3b37bde1fd..26c3a58b43a 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -439,7 +439,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.2.3",
+        "vscode-emmet-helper": "^1.2.4",
         "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
         "vscode-nls": "3.2.1"
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index 15529b91be6..1bf19c23853 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2052,9 +2052,9 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.3.tgz#395504d4d9b8fb0bf967af83aeef649631d1595e"
+vscode-emmet-helper@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.4.tgz#48056974d13036722af019235b9f750a495de728"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index d8e22d5d516..1a3d47f448c 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^3.0.8",
-    "vscode-emmet-helper": "1.2.3",
+    "vscode-emmet-helper": "1.2.4",
     "vscode-html-languageservice": "^2.1.2",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index e64ba3def31..fa44e61f9bb 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.8:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
 
-vscode-emmet-helper@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.3.tgz#395504d4d9b8fb0bf967af83aeef649631d1595e"
+vscode-emmet-helper@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.4.tgz#48056974d13036722af019235b9f750a495de728"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"

From 92d8e1dfd3edfbe8d7901411e22dfc86c5ec9421 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 27 Mar 2018 17:25:28 -0700
Subject: [PATCH 119/383] Fix issue filing on theme extensions, fixes #46771

---
 src/vs/code/electron-browser/issue/issueReporterMain.ts  | 4 ++--
 src/vs/code/electron-browser/issue/issueReporterModel.ts | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index c0539a469d7..78aa4c56373 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -210,7 +210,7 @@ export class IssueReporter extends Disposable {
 		});
 
 		const numberOfThemeExtesions = themes && themes.length;
-		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes });
+		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: extensions });
 		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
 
 		if (this.environmentService.disableExtensions || extensions.length === 0) {
@@ -786,7 +786,7 @@ export class IssueReporter extends Disposable {
 
 		this.addEventListener('extension-selector', 'change', (e: Event) => {
 			const selectedExtensionId = (<HTMLInputElement>e.target).value;
-			const extensions = this.issueReporterModel.getData().enabledNonThemeExtesions;
+			const extensions = this.issueReporterModel.getData().allExtensions;
 			const matches = extensions.filter(extension => extension.identifier.id === selectedExtensionId);
 			if (matches.length) {
 				this.issueReporterModel.update({ selectedExtension: matches[0] });
diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index 8be6fa1bea9..43d581ea6a3 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -26,6 +26,7 @@ export interface IssueReporterData {
 	includeSettingsSearchDetails?: boolean;
 
 	numberOfThemeExtesions?: number;
+	allExtensions?: ILocalExtension[];
 	enabledNonThemeExtesions?: ILocalExtension[];
 	extensionsDisabled?: boolean;
 	fileOnExtension?: boolean;

From c1e5eca5b9541609bfd19bdbf7ea24afa90775d2 Mon Sep 17 00:00:00 2001
From: SteVen Batten <stbatt@microsoft.com>
Date: Tue, 27 Mar 2018 17:33:05 -0700
Subject: [PATCH 120/383] fixing validation on maxMemory setting fixes #46767

---
 src/vs/workbench/parts/files/browser/editors/textFileEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 3c1a0643cb9..86e9ed3134a 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -171,7 +171,7 @@ export class TextFileEditor extends BaseTextEditor {
 				}
 
 				if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_EXCEED_MEMORY_LIMIT) {
-					let memoryLimit = this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') | 4096;
+					let memoryLimit = Math.max(2048, +this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') || 4096);
 
 					return TPromise.wrapError<void>(errors.create(toErrorMessage(error), {
 						actions: [

From 0f2dfd7456643cfb234e64d94b2b216b7ced3116 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 27 Mar 2018 09:23:14 -0700
Subject: [PATCH 121/383] Fix #46712

---
 .../parts/search/electron-browser/search.contribution.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index 8470d739618..cffdcc6151d 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -252,7 +252,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 		title: toggleSearchViewPositionLabel
 	},
 	when: Constants.SearchViewVisibleKey,
-	group: 'search',
+	group: 'search_2',
 	order: 3
 });
 

From 528daff5e340f1139107a5db11a5da342efd983e Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 27 Mar 2018 09:23:28 -0700
Subject: [PATCH 122/383] :lipstick:

---
 src/vs/workbench/parts/search/browser/searchResultsView.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index 9ce97eec3b1..1d78469272a 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -386,8 +386,7 @@ export class SearchTreeController extends WorkbenchTreeController {
 				const actions: IAction[] = [];
 				fillInActions(this.contextMenu, { shouldForwardArgs: true }, actions, this.contextMenuService);
 				return TPromise.as(actions);
-			},
-			// getActionsContext: () => element instanceof OpenEditor ? { groupId: element.group.id, editorIndex: element.editorIndex } : { groupId: element.id }
+			}
 		});
 
 		return true;

From 976d1649ce722dca7c0651b7c99de36a051e2442 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 27 Mar 2018 18:04:48 -0700
Subject: [PATCH 123/383] Change default search replace keyboard shortcuts
 again to match editor find

---
 .../parts/search/electron-browser/search.contribution.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index cffdcc6151d..e26158e086f 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -131,8 +131,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.MatchFocusKey),
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
-	secondary: [KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1],
+	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
 	handler: (accessor, args: any) => {
 		const searchView = getSearchView(accessor.get(IViewletService), accessor.get(IPanelService));
 		const tree: ITree = searchView.getControl();
@@ -144,7 +143,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFileActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.FileFocusKey),
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
+	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
+	secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
 	handler: (accessor, args: any) => {
 		const searchView = getSearchView(accessor.get(IViewletService), accessor.get(IPanelService));
 		const tree: ITree = searchView.getControl();
@@ -156,7 +156,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFolderActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.FolderFocusKey),
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
+	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
+	secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
 	handler: (accessor, args: any) => {
 		const searchView = getSearchView(accessor.get(IViewletService), accessor.get(IPanelService));
 		const tree: ITree = searchView.getControl();

From acc4c222a9d490e441c9672622805a7e4342c41a Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 27 Mar 2018 18:13:56 -0700
Subject: [PATCH 124/383] Fix #46730 - search count badge in wrong place in
 selected row, when search tree is not focused

---
 src/vs/workbench/parts/search/browser/media/searchview.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/media/searchview.css b/src/vs/workbench/parts/search/browser/media/searchview.css
index 7d0f83a45a6..9592001ebe8 100644
--- a/src/vs/workbench/parts/search/browser/media/searchview.css
+++ b/src/vs/workbench/parts/search/browser/media/searchview.css
@@ -285,9 +285,9 @@
 .search-view > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .monaco-count-badge,
 .search-view > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .monaco-count-badge,
 .search-view > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .monaco-count-badge,
-.search-view > .results > .monaco-tree.focused .monaco-tree-row.focused .content .filematch .monaco-count-badge,
-.search-view > .results > .monaco-tree.focused .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
-.search-view > .results > .monaco-tree.focused .monaco-tree-row.focused .content .linematch .monaco-count-badge {
+.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .monaco-count-badge,
+.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
+.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .monaco-count-badge {
 	display: none;
 }
 

From 95b0cffe72a9d32e6ef3780dcc050a336e7b2968 Mon Sep 17 00:00:00 2001
From: Gus Hurovich <gushurovich@gmail.com>
Date: Tue, 27 Mar 2018 18:32:46 -0700
Subject: [PATCH 125/383] Fix for #46745 (#46788)

* Fix for #46745

* If { found in selector, don't partial parse.
Adding sanity checks
---
 .../emmet/src/defaultCompletionProvider.ts    |  6 --
 extensions/emmet/src/util.ts                  | 56 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 98d15f9cdd0..962171ba6b1 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -96,10 +96,4 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			return new vscode.CompletionList(newItems, true);
 		});
 	}
-
-
-
-
-
-
 }
\ No newline at end of file
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index f0043f6b2db..0fb4471eda5 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -196,12 +196,62 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 			} else {
 				stream.next();
 			}
+		} else if (ch === star) {
+			stream.backUp(1);
+			if (stream.peek() === slash) {
+				return;
+			} else {
+				stream.next();
+			}
 		}
 	}
-	// We are at an opening brace. We need to include its selector, but with one nonspace character is enough.
-	while (!stream.sof() && String.fromCharCode(stream.backUp(1)).match(/\s/)) { }
 
-	startPosition = stream.pos;
+	// We are at an opening brace. We need to include its selector.
+	// We need one non whitespace character, that's not commented and is not a block { }
+	currentLine = stream.pos.line;
+	openBracesRemaining = 0;
+	while (!stream.sof()) {
+		// Find a nonspace character
+		while (!stream.sof() && String.fromCharCode(stream.backUp(1)).match(/\s/)) { }
+		if (stream.sof()) {
+			break;
+		}
+		let characterFound = stream.peek();
+		// Check if such character is end of comment.
+		if (characterFound === slash) {
+			let ch = stream.backUp(1);
+			if (ch === star) {
+				stream.pos = findOpeningCommentBeforePosition(document, stream.pos) || startPosition;
+			} else {
+				stream.next();
+			}
+			continue;
+		}
+		// In not CSS stylesheets, we need to skip singleLine comments.
+		if (!isCSS && stream.pos.line !== currentLine) {
+			currentLine = stream.pos.line;
+			let startLineComment = document.lineAt(currentLine).text.indexOf('//');
+			if (startLineComment > -1 && startLineComment < stream.pos.character) {
+				stream.pos = new vscode.Position(currentLine, startLineComment);
+				continue;
+			}
+		}
+		// Here, we know we are not in a comment
+		if (characterFound === closeBrace) {
+			openBracesRemaining++;
+		} else if (!openBracesRemaining) {
+			if (characterFound === openBrace) {
+				return;
+			} else {
+				break;
+			}
+		} else if (characterFound === openBrace) {
+			openBracesRemaining--;
+		}
+	}
+	if (!stream.sof()) {
+		startPosition = stream.pos;
+	}
 	try {
 		return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
 	} catch (e) {

From 19001175dd123dc42c70d24a63074217bcc42339 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 09:44:06 +0200
Subject: [PATCH 126/383] Progress API percentage is ambiguous (fixes #46743)

---
 src/vs/platform/progress/common/progress.ts   |  2 +-
 src/vs/vscode.d.ts                            | 12 +++++-----
 src/vs/workbench/api/node/extHostProgress.ts  |  8 +++----
 .../progress/browser/progressService2.ts      | 22 +++++++++----------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index 69d8ce1d430..25fd7b3d97a 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -80,7 +80,7 @@ export interface IProgressOptions {
 
 export interface IProgressStep {
 	message?: string;
-	percentage?: number;
+	increment?: number;
 }
 
 export const IProgressService2 = createDecorator<IProgressService2>('progressService2');
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 93552cf0e67..9d3bdf6a800 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -4038,7 +4038,8 @@ declare module 'vscode' {
 
 		/**
 		 * Report a progress update.
-		 * @param value A progress item, like a message or an updated percentage value
+		 * @param value A progress item, like a message and/or an
+		 * report on how much work finished
 		 */
 		report(value: T): void;
 	}
@@ -5213,9 +5214,10 @@ declare module 'vscode' {
 		 * @param task A callback returning a promise. Progress state can be reported with
 		 * the provided [progress](#Progress)-object.
 		 *
-		 * To report discrete progress, use `percentage` to indicate how much work has been completed. Each call with
-		 * a `percentage` value will be summed up and reflected as overall progress until 100% is reached. Note that
-		 * currently only `ProgressLocation.Notification` is capable of showing discrete progress.
+		 * To report discrete progress, use `increment` to indicate how much work has been completed. Each call with
+		 * a `increment` value will be summed up and reflected as overall progress until 100% is reached (a value of
+		 * e.g. `10` accounts for `10%` of work done).
+		 * Note that currently only `ProgressLocation.Notification` is capable of showing discrete progress.
 		 *
 		 * To monitor if the operation has been cancelled by the user, use the provided [`CancellationToken`](#CancellationToken).
 		 * Note that currently only `ProgressLocation.Notification` is supporting to show a cancel button to cancel the
@@ -5223,7 +5225,7 @@ declare module 'vscode' {
 		 *
 		 * @return The thenable the task-callback returned.
 		 */
-		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; percentage?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
+		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
 
 		/**
 		 * Creates a status bar [item](#StatusBarItem).
diff --git a/src/vs/workbench/api/node/extHostProgress.ts b/src/vs/workbench/api/node/extHostProgress.ts
index ffb4f857c57..a9f8427ef0a 100644
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -70,10 +70,10 @@ export class ExtHostProgress implements ExtHostProgressShape {
 
 function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IProgressStep {
 	result.message = currentValue.message;
-	if (typeof currentValue.percentage === 'number' && typeof result.message === 'number') {
-		result.percentage += currentValue.percentage;
-	} else if (typeof currentValue.percentage === 'number') {
-		result.percentage = currentValue.percentage;
+	if (typeof currentValue.increment === 'number' && typeof result.message === 'number') {
+		result.increment += currentValue.increment;
+	} else if (typeof currentValue.increment === 'number') {
+		result.increment = currentValue.increment;
 	}
 	return result;
 }
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index 4972e385123..7f58433b7c2 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -166,10 +166,10 @@ export class ProgressService2 implements IProgressService2 {
 		}
 	}
 
-	private _withNotificationProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string, percentage?: number }>) => P, onDidCancel?: () => void): P {
+	private _withNotificationProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string, increment?: number }>) => P, onDidCancel?: () => void): P {
 		const toDispose: IDisposable[] = [];
 
-		const createNotification = (message: string, percentage?: number): INotificationHandle => {
+		const createNotification = (message: string, increment?: number): INotificationHandle => {
 			if (!message) {
 				return undefined; // we need a message at least
 			}
@@ -201,7 +201,7 @@ export class ProgressService2 implements IProgressService2 {
 				actions
 			});
 
-			updateProgress(handle, percentage);
+			updateProgress(handle, increment);
 
 			once(handle.onDidDispose)(() => {
 				dispose(toDispose);
@@ -210,26 +210,26 @@ export class ProgressService2 implements IProgressService2 {
 			return handle;
 		};
 
-		const updateProgress = (notification: INotificationHandle, percentage?: number): void => {
-			if (typeof percentage === 'number' && percentage >= 0) {
+		const updateProgress = (notification: INotificationHandle, increment?: number): void => {
+			if (typeof increment === 'number' && increment >= 0) {
 				notification.progress.total(100); // always percentage based
-				notification.progress.worked(percentage);
+				notification.progress.worked(increment);
 			} else {
 				notification.progress.infinite();
 			}
 		};
 
 		let handle: INotificationHandle;
-		const updateNotification = (message?: string, percentage?: number): void => {
+		const updateNotification = (message?: string, increment?: number): void => {
 			if (!handle) {
-				handle = createNotification(message, percentage);
+				handle = createNotification(message, increment);
 			} else {
 				if (typeof message === 'string') {
 					handle.updateMessage(message);
 				}
 
-				if (typeof percentage === 'number') {
-					updateProgress(handle, percentage);
+				if (typeof increment === 'number') {
+					updateProgress(handle, increment);
 				}
 			}
 		};
@@ -240,7 +240,7 @@ export class ProgressService2 implements IProgressService2 {
 		// Update based on progress
 		const p = callback({
 			report: progress => {
-				updateNotification(progress.message, progress.percentage);
+				updateNotification(progress.message, progress.increment);
 			}
 		});
 

From dafdde11c92f2bc2cdba853a75b83cbfa5f949dd Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 27 Mar 2018 17:43:33 +0200
Subject: [PATCH 127/383] fixes #45911

---
 extensions/git/src/model.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index 3ceb2dc3fc9..65036c93a7b 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -235,10 +235,9 @@ export class Model {
 			if (repository.submodules.length > submodulesLimit) {
 				window.showWarningMessage(localize('too many submodules', "The '{0}' repository has {1} submodules which won't be opened automatically. You can still open each one individually by opening a file within.", path.basename(repository.root), repository.submodules.length));
 				statusListener.dispose();
-				return;
 			}
 
-			this.scanSubmodules(repository);
+			this.scanSubmodules(repository, submodulesLimit);
 		};
 
 		const statusListener = repository.onDidRunGitStatus(checkForSubmodules);
@@ -260,7 +259,7 @@ export class Model {
 		this._onDidOpenRepository.fire(repository);
 	}
 
-	private scanSubmodules(repository: Repository): void {
+	private scanSubmodules(repository: Repository, limit: number): void {
 		const shouldScanSubmodules = workspace
 			.getConfiguration('git', Uri.file(repository.root))
 			.get<boolean>('detectSubmodules') === true;
@@ -270,6 +269,7 @@ export class Model {
 		}
 
 		repository.submodules
+			.slice(0, limit)
 			.map(r => path.join(repository.root, r.path))
 			.forEach(p => this.eventuallyScanPossibleGitRepository(p));
 	}

From c4ad3f2d311f1dff430302e5ee7dc7559007b26b Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 28 Mar 2018 10:40:02 +0200
Subject: [PATCH 128/383] fixes #45526

---
 build/tfs/product-build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index 52b2e8fbdb0..f0e6f2811a3 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -55,11 +55,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "PageHash",
@@ -79,11 +79,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "Append",
@@ -137,11 +137,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "PageHash",
@@ -161,11 +161,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "Append",

From 22a30ac9fa7bf95104eb386561ad05452e820855 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 10:44:27 +0200
Subject: [PATCH 129/383] fix #46619

---
 .../browser/parts/editor/editorStatus.ts      | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 4afe6734d9e..95974fc7d85 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -64,20 +64,44 @@ import { Themable } from 'vs/workbench/common/theme';
 // tslint:disable-next-line:import-patterns
 import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
 
-function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport {
-	if (input instanceof SideBySideEditorInput) {
-		input = input.master;
+class SideBySideEditorEncodingSupport implements IEncodingSupport {
+	constructor(private master: IEncodingSupport, private details: IEncodingSupport) { }
+
+	public getEncoding(): string {
+		return this.master.getEncoding(); // always report from modified (right hand) side
 	}
 
+	public setEncoding(encoding: string, mode: EncodingMode): void {
+		[this.master, this.details].forEach(s => s.setEncoding(encoding, mode));
+	}
+}
+
+function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport {
+
+	// Untitled Editor
 	if (input instanceof UntitledEditorInput) {
 		return input;
 	}
 
+	// Side by Side (diff) Editor
+	if (input instanceof SideBySideEditorInput) {
+		const masterEncodingSupport = toEditorWithEncodingSupport(input.master);
+		const detailsEncodingSupport = toEditorWithEncodingSupport(input.details);
+
+		if (masterEncodingSupport && detailsEncodingSupport) {
+			return new SideBySideEditorEncodingSupport(masterEncodingSupport, detailsEncodingSupport);
+		}
+
+		return masterEncodingSupport;
+	}
+
+	// File or Resource Editor
 	let encodingSupport = input as IFileEditorInput;
 	if (types.areFunctions(encodingSupport.setEncoding, encodingSupport.getEncoding)) {
 		return encodingSupport;
 	}
 
+	// Unsupported for any other editor
 	return null;
 }
 

From e94f77ab6576d1878872bb597636eb1fa97d6482 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 10:47:39 +0200
Subject: [PATCH 130/383] notifications - limit stack height

---
 .../browser/parts/notifications/notificationsToasts.ts          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 6be7e0e3fa5..243d2752b4b 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -437,6 +437,8 @@ export class NotificationsToasts extends Themable {
 			availableHeight -= (2 * 12); // adjust for paddings top and bottom
 		}
 
+		availableHeight = Math.round(availableHeight * 0.618); // try to not cover the full height for stacked toasts
+
 		return new Dimension(Math.min(maxWidth, availableWidth), availableHeight);
 	}
 

From 66b50b40fe36c19026dc44cc3e3ec7842097b959 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 28 Mar 2018 11:14:29 +0200
Subject: [PATCH 131/383] fix #46632

---
 .../referenceSearch/referenceSearch.ts        | 24 +++++++++++++++++++
 .../referenceSearch/referencesController.ts   | 16 +++++++------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
index a8510002d8c..90169cab7f1 100644
--- a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
+++ b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
@@ -206,6 +206,18 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'goToNextReferenceFromEmbeddedEditor',
+	weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+	primary: KeyCode.F4,
+	when: PeekContext.inPeekEditor,
+	handler(accessor) {
+		withController(accessor, controller => {
+			controller.goToNextOrPreviousReference(true);
+		});
+	}
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'goToPreviousReference',
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
@@ -218,6 +230,18 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'goToPreviousReferenceFromEmbeddedEditor',
+	weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+	primary: KeyMod.Shift | KeyCode.F4,
+	when: PeekContext.inPeekEditor,
+	handler(accessor) {
+		withController(accessor, controller => {
+			controller.goToNextOrPreviousReference(false);
+		});
+	}
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'closeReferenceSearch',
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
index a06529eecdf..88079826a6d 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -175,13 +175,15 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 	}
 
 	public async goToNextOrPreviousReference(fwd: boolean) {
-		let source = this._model.nearestReference(this._editor.getModel().uri, this._widget.position);
-		let target = this._model.nextOrPreviousReference(source, fwd);
-		let editorFocus = this._editor.isFocused();
-		await this._widget.setSelection(target);
-		await this._gotoReference(target);
-		if (editorFocus) {
-			this._editor.focus();
+		if (this._model) { // can be called while still resolving...
+			let source = this._model.nearestReference(this._editor.getModel().uri, this._widget.position);
+			let target = this._model.nextOrPreviousReference(source, fwd);
+			let editorFocus = this._editor.isFocused();
+			await this._widget.setSelection(target);
+			await this._gotoReference(target);
+			if (editorFocus) {
+				this._editor.focus();
+			}
 		}
 	}
 

From e44ed5c20819f74a0ae0f08d800216bb01140cec Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 28 Mar 2018 11:25:15 +0200
Subject: [PATCH 132/383] fix #46715

---
 src/vs/editor/contrib/gotoError/gotoErrorWidget.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
index 0190c1e630b..4166d476ab5 100644
--- a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
@@ -22,7 +22,7 @@ import { editorErrorForeground, editorErrorBorder, editorWarningForeground, edit
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ScrollType } from 'vs/editor/common/editorCommon';
-import { getBaseLabel } from 'vs/base/common/labels';
+import { getBaseLabel, getPathLabel } from 'vs/base/common/labels';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { Event, Emitter } from 'vs/base/common/event';
 
@@ -110,6 +110,7 @@ class MessageWidget {
 				let relatedResource = document.createElement('span');
 				dom.addClass(relatedResource, 'filename');
 				relatedResource.innerHTML = `${getBaseLabel(related.resource)}(${related.startLineNumber}, ${related.startColumn}): `;
+				relatedResource.title = getPathLabel(related.resource);
 				this._relatedDiagnostics.set(relatedResource, related);
 
 				let relatedMessage = document.createElement('span');

From 04ab6d103c13c9cbdd9d98dec18553bf046df8d7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 11:26:03 +0200
Subject: [PATCH 133/383] list/tree: be consistent about not supporting
 inactive focus colors (for #46129)

---
 src/vs/base/browser/ui/list/listWidget.ts      | 6 ------
 src/vs/editor/contrib/suggest/suggestWidget.ts | 1 -
 src/vs/platform/theme/common/colorRegistry.ts  | 2 --
 src/vs/platform/theme/common/styler.ts         | 8 +-------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 8026e676bdd..e43e322860c 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -618,11 +618,6 @@ export class DefaultStyleController implements IStyleController {
 			content.push(`.monaco-list${suffix}:focus .monaco-list-row.selected.focused { color: ${styles.listFocusAndSelectionForeground}; }`);
 		}
 
-		if (styles.listInactiveFocusBackground) {
-			content.push(`.monaco-list${suffix} .monaco-list-row.focused { background-color:  ${styles.listInactiveFocusBackground}; }`);
-			content.push(`.monaco-list${suffix} .monaco-list-row.focused:hover { background-color:  ${styles.listInactiveFocusBackground}; }`); // overwrite :hover style in this case!
-		}
-
 		if (styles.listInactiveSelectionBackground) {
 			content.push(`.monaco-list${suffix} .monaco-list-row.selected { background-color:  ${styles.listInactiveSelectionBackground}; }`);
 			content.push(`.monaco-list${suffix} .monaco-list-row.selected:hover { background-color:  ${styles.listInactiveSelectionBackground}; }`); // overwrite :hover style in this case!
@@ -686,7 +681,6 @@ export interface IListStyles {
 	listFocusAndSelectionForeground?: Color;
 	listInactiveSelectionBackground?: Color;
 	listInactiveSelectionForeground?: Color;
-	listInactiveFocusBackground?: Color;
 	listHoverBackground?: Color;
 	listHoverForeground?: Color;
 	listDropBackground?: Color;
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index cf433d3dc8a..2833ee66219 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -445,7 +445,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		this.toDispose = [
 			attachListStyler(this.list, themeService, {
-				listInactiveFocusBackground: editorSuggestWidgetSelectedBackground,
 				listInactiveFocusOutline: activeContrastBorder
 			}),
 			themeService.onThemeChange(t => this.onThemeChange(t)),
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index e8b4f832830..7a283de5e34 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -192,8 +192,6 @@ export const listActiveSelectionBackground = registerColor('list.activeSelection
 export const listActiveSelectionForeground = registerColor('list.activeSelectionForeground', { dark: Color.white, light: Color.white, hc: null }, nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#3F3F46', light: '#CCCEDB', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionForeground = registerColor('list.inactiveSelectionForeground', { dark: null, light: null, hc: null }, nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
-export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground', { dark: '#313135', light: '#d8dae6', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
-export const listInactiveFocusForeground = registerColor('list.inactiveFocusForeground', { dark: null, light: null, hc: null }, nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
 export const listHoverForeground = registerColor('list.hoverForeground', { dark: null, light: null, hc: null }, nls.localize('listHoverForeground', "List/Tree foreground when hovering over items using the mouse."));
 export const listDropBackground = registerColor('list.dropBackground', { dark: listFocusBackground, light: listFocusBackground, hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
index afb14896d04..1b37ca02714 100644
--- a/src/vs/platform/theme/common/styler.ts
+++ b/src/vs/platform/theme/common/styler.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusForeground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, lighten, badgeBackground, badgeForeground, progressBarBackground } from 'vs/platform/theme/common/colorRegistry';
+import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, lighten, badgeBackground, badgeForeground, progressBarBackground } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
@@ -183,8 +183,6 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
 		listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listActiveSelectionForeground,
 		listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || listInactiveSelectionBackground,
 		listInactiveSelectionForeground: (style && style.listInactiveSelectionForeground) || listInactiveSelectionForeground,
-		listInactiveFocusBackground: (style && style.listInactiveFocusBackground) || listInactiveFocusBackground,
-		listInactiveFocusForeground: (style && style.listInactiveFocusForeground) || listInactiveFocusForeground,
 		listHoverBackground: (style && style.listHoverBackground) || listHoverBackground,
 		listHoverForeground: (style && style.listHoverForeground) || listHoverForeground,
 		listDropBackground: (style && style.listDropBackground) || listDropBackground,
@@ -203,8 +201,6 @@ export interface IListStyleOverrides extends IStyleOverrides {
 	listFocusAndSelectionForeground?: ColorIdentifier;
 	listInactiveSelectionBackground?: ColorIdentifier;
 	listInactiveSelectionForeground?: ColorIdentifier;
-	listInactiveFocusBackground?: ColorIdentifier;
-	listInactiveFocusForeground?: ColorIdentifier;
 	listHoverBackground?: ColorIdentifier;
 	listHoverForeground?: ColorIdentifier;
 	listDropBackground?: ColorIdentifier;
@@ -227,8 +223,6 @@ export const defaultListStyles: IColorMapping = {
 	listFocusAndSelectionForeground: listActiveSelectionForeground,
 	listInactiveSelectionBackground: listInactiveSelectionBackground,
 	listInactiveSelectionForeground: listInactiveSelectionForeground,
-	listInactiveFocusBackground: listInactiveFocusBackground,
-	listInactiveFocusForeground: listInactiveFocusForeground,
 	listHoverBackground: listHoverBackground,
 	listHoverForeground: listHoverForeground,
 	listDropBackground: listDropBackground,

From 86127f05dff7c695d7f5018d8a7aab131edba50f Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Wed, 28 Mar 2018 11:30:46 +0200
Subject: [PATCH 134/383] simple debug editor: hide curos in overview ruler

fixes #46822
---
 .../workbench/parts/debug/electron-browser/simpleDebugEditor.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts b/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
index 2b7a2e33839..de7fbfcc013 100644
--- a/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
@@ -56,6 +56,7 @@ export class SimpleDebugEditor extends CodeEditorWidget {
 			lineNumbers: 'off',
 			folding: false,
 			selectOnLineNumbers: false,
+			hideCursorInOverviewRuler: true,
 			selectionHighlight: false,
 			scrollbar: {
 				horizontal: 'hidden'

From 8791b84649f21962e7aecebc5313b62b85075aa4 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Wed, 28 Mar 2018 11:35:27 +0200
Subject: [PATCH 135/383] breakpoint widget: set cursor on end of line

fixes #46823
---
 .../workbench/parts/debug/electron-browser/breakpointWidget.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index 9a2b023cf55..595a504f9a6 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -142,6 +142,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 		this.createBreakpointInput(dom.append(container, $('.inputContainer')));
 
 		this.input.getModel().setValue(this.getInputValue(this.breakpoint));
+		this.input.setPosition({ lineNumber: 1, column: this.input.getModel().getLineMaxColumn(1) });
 		// Due to an electron bug we have to do the timeout, otherwise we do not get focus
 		setTimeout(() => this.input.focus(), 100);
 	}

From 6cd5f64034202d030860e913fc65aa377f28d3c6 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Wed, 28 Mar 2018 11:40:01 +0200
Subject: [PATCH 136/383] fixes #46824

---
 .../workbench/parts/debug/electron-browser/breakpointWidget.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index 595a504f9a6..5deb9e1cb89 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -218,7 +218,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
 				let suggestionsPromise: TPromise<ISuggestResult>;
 				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
-					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(1, 1), 'none', undefined, _context).then(suggestions => {
+					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(this.lineNumber, this.column), 'none', undefined, _context).then(suggestions => {
 						return {
 							suggestions: suggestions.map(s => {
 								if (this.context === Context.CONDITION) {

From 15ca98b1895d1df2dc14e3c141ec4a668b1c9afe Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 12:06:23 +0200
Subject: [PATCH 137/383] Show telemetry notice on first start (fixes #46623)

---
 .../gettingStarted/electron-browser/telemetryOptOut.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
index 072ca1fbb84..9dea022290c 100644
--- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
+++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
@@ -13,7 +13,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import URI from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IWindowService } from 'vs/platform/windows/common/windows';
+import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
 
 export class TelemetryOptOut implements IWorkbenchContribution {
 
@@ -24,13 +24,17 @@ export class TelemetryOptOut implements IWorkbenchContribution {
 		@IOpenerService openerService: IOpenerService,
 		@INotificationService notificationService: INotificationService,
 		@IWindowService windowService: IWindowService,
+		@IWindowsService windowsService: IWindowsService,
 		@ITelemetryService telemetryService: ITelemetryService
 	) {
 		if (!product.telemetryOptOutUrl || storageService.get(TelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN)) {
 			return;
 		}
-		windowService.isFocused().then(focused => {
-			if (!focused) {
+		Promise.all([
+			windowService.isFocused(),
+			windowsService.getWindowCount()
+		]).then(([focused, count]) => {
+			if (!focused && count > 1) {
 				return null;
 			}
 			storageService.store(TelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN, true);

From ef7763a2d5833e6b8e2335bf21596f21a536e9aa Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 28 Mar 2018 12:06:59 +0200
Subject: [PATCH 138/383] improve windows update ux

---
 src/vs/workbench/parts/update/electron-browser/update.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 79eb2e0acce..93cf12eeb33 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -355,7 +355,7 @@ export class UpdateContribution implements IGlobalActivity {
 
 		const handle = this.notificationService.notify({
 			severity: severity.Info,
-			message: nls.localize('updateAvailable', "There's an available update: {0} {1}", product.nameLong, update.productVersion),
+			message: nls.localize('updateAvailable', "There's an update available: {0} {1}", product.nameLong, update.productVersion),
 			actions: { primary: [installUpdateAction, NotNowAction, releaseNotesAction] }
 		});
 		once(handle.onDidDispose)(() => dispose(installUpdateAction, releaseNotesAction));
@@ -379,7 +379,7 @@ export class UpdateContribution implements IGlobalActivity {
 
 	// windows and mac
 	private onUpdateReady(update: IUpdate): void {
-		if (!this.shouldShowNotification()) {
+		if (!isWindows && !this.shouldShowNotification()) {
 			return;
 		}
 
@@ -396,10 +396,6 @@ export class UpdateContribution implements IGlobalActivity {
 	}
 
 	private shouldShowNotification(): boolean {
-		if (isWindows) {
-			return true;
-		}
-
 		const currentVersion = product.commit;
 		const currentMillis = new Date().getTime();
 		const lastKnownVersion = this.storageService.get('update/lastKnownVersion', StorageScope.GLOBAL);

From 805d0785aaa50e7de44f6c71b7ef548fc88c7094 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 11:41:58 +0200
Subject: [PATCH 139/383] Remove ChunksTextBuffer

---
 .../model/chunksTextBuffer/bufferPiece.ts     |  323 ----
 .../chunksTextBuffer/chunksTextBuffer.ts      | 1526 -----------------
 .../chunksTextBufferBuilder.ts                |  186 --
 src/vs/editor/common/model/textModel.ts       |    7 +-
 .../common/model/benchmark/benchmarkUtils.ts  |    3 +-
 .../chunksTextBuffer/bufferPiece.test.ts      |   61 -
 6 files changed, 2 insertions(+), 2104 deletions(-)
 delete mode 100644 src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts
 delete mode 100644 src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
 delete mode 100644 src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts
 delete mode 100644 src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts

diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts
deleted file mode 100644
index 53063409aea..00000000000
--- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { CharCode } from 'vs/base/common/charCode';
-
-export class LeafOffsetLenEdit {
-	constructor(
-		public readonly start: number,
-		public readonly length: number,
-		public readonly text: string
-	) { }
-}
-
-export class BufferPiece {
-	private readonly _str: string;
-	public get text(): string { return this._str; }
-
-	private readonly _lineStarts: Uint32Array;
-
-	constructor(str: string, lineStarts: Uint32Array = null) {
-		this._str = str;
-		if (lineStarts === null) {
-			this._lineStarts = createLineStartsFast(str);
-		} else {
-			this._lineStarts = lineStarts;
-		}
-	}
-
-	public length(): number {
-		return this._str.length;
-	}
-
-	public newLineCount(): number {
-		return this._lineStarts.length;
-	}
-
-	public lineStartFor(relativeLineIndex: number): number {
-		return this._lineStarts[relativeLineIndex];
-	}
-
-	public charCodeAt(index: number): number {
-		return this._str.charCodeAt(index);
-	}
-
-	public substr(from: number, length: number): string {
-		return this._str.substr(from, length);
-	}
-
-	public findLineStartBeforeOffset(offset: number): number {
-		if (this._lineStarts.length === 0 || offset < this._lineStarts[0]) {
-			return -1;
-		}
-
-		let low = 0, high = this._lineStarts.length - 1;
-
-		while (low < high) {
-			let mid = low + Math.ceil((high - low) / 2);
-			let lineStart = this._lineStarts[mid];
-
-			if (offset === lineStart) {
-				return mid;
-			} else if (offset < lineStart) {
-				high = mid - 1;
-			} else {
-				low = mid;
-			}
-		}
-
-		return low;
-	}
-
-	public findLineFirstNonWhitespaceIndex(searchStartOffset: number): number {
-		for (let i = searchStartOffset, len = this._str.length; i < len; i++) {
-			const chCode = this._str.charCodeAt(i);
-			if (chCode === CharCode.CarriageReturn || chCode === CharCode.LineFeed) {
-				// Reached EOL
-				return -2;
-			}
-			if (chCode !== CharCode.Space && chCode !== CharCode.Tab) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	public findLineLastNonWhitespaceIndex(searchStartOffset: number): number {
-		for (let i = searchStartOffset - 1; i >= 0; i--) {
-			const chCode = this._str.charCodeAt(i);
-			if (chCode === CharCode.CarriageReturn || chCode === CharCode.LineFeed) {
-				// Reached EOL
-				return -2;
-			}
-			if (chCode !== CharCode.Space && chCode !== CharCode.Tab) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	public static normalizeEOL(target: BufferPiece, eol: '\r\n' | '\n'): BufferPiece {
-		return new BufferPiece(target._str.replace(/\r\n|\r|\n/g, eol));
-	}
-
-	public static deleteLastChar(target: BufferPiece): BufferPiece {
-		const targetCharsLength = target.length();
-		const targetLineStartsLength = target.newLineCount();
-		const targetLineStarts = target._lineStarts;
-
-		let newLineStartsLength;
-		if (targetLineStartsLength > 0 && targetLineStarts[targetLineStartsLength - 1] === targetCharsLength) {
-			newLineStartsLength = targetLineStartsLength - 1;
-		} else {
-			newLineStartsLength = targetLineStartsLength;
-		}
-
-		let newLineStarts = new Uint32Array(newLineStartsLength);
-		newLineStarts.set(targetLineStarts);
-
-		return new BufferPiece(
-			target._str.substr(0, targetCharsLength - 1),
-			newLineStarts
-		);
-	}
-
-	public static insertFirstChar(target: BufferPiece, character: number): BufferPiece {
-		const targetLineStartsLength = target.newLineCount();
-		const targetLineStarts = target._lineStarts;
-		const insertLineStart = ((character === CharCode.CarriageReturn && (targetLineStartsLength === 0 || targetLineStarts[0] !== 1 || target.charCodeAt(0) !== CharCode.LineFeed)) || (character === CharCode.LineFeed));
-
-		const newLineStartsLength = (insertLineStart ? targetLineStartsLength + 1 : targetLineStartsLength);
-		let newLineStarts = new Uint32Array(newLineStartsLength);
-
-		if (insertLineStart) {
-			newLineStarts[0] = 1;
-			for (let i = 0; i < targetLineStartsLength; i++) {
-				newLineStarts[i + 1] = targetLineStarts[i] + 1;
-			}
-		} else {
-			for (let i = 0; i < targetLineStartsLength; i++) {
-				newLineStarts[i] = targetLineStarts[i] + 1;
-			}
-		}
-
-		return new BufferPiece(
-			String.fromCharCode(character) + target._str,
-			newLineStarts
-		);
-	}
-
-	public static join(first: BufferPiece, second: BufferPiece): BufferPiece {
-		const firstCharsLength = first._str.length;
-
-		const firstLineStartsLength = first._lineStarts.length;
-		const secondLineStartsLength = second._lineStarts.length;
-
-		const firstLineStarts = first._lineStarts;
-		const secondLineStarts = second._lineStarts;
-
-		const newLineStartsLength = firstLineStartsLength + secondLineStartsLength;
-		let newLineStarts = new Uint32Array(newLineStartsLength);
-		newLineStarts.set(firstLineStarts, 0);
-		for (let i = 0; i < secondLineStartsLength; i++) {
-			newLineStarts[i + firstLineStartsLength] = secondLineStarts[i] + firstCharsLength;
-		}
-
-		return new BufferPiece(first._str + second._str, newLineStarts);
-	}
-
-	public static replaceOffsetLen(target: BufferPiece, edits: LeafOffsetLenEdit[], idealLeafLength: number, maxLeafLength: number, result: BufferPiece[]): void {
-		const editsSize = edits.length;
-		const originalCharsLength = target.length();
-		if (editsSize === 1 && edits[0].text.length === 0 && edits[0].start === 0 && edits[0].length === originalCharsLength) {
-			// special case => deleting everything
-			return;
-		}
-
-		let pieces: string[] = new Array<string>(2 * editsSize + 1);
-		let originalFromIndex = 0;
-		let piecesTextLength = 0;
-		for (let i = 0; i < editsSize; i++) {
-			const edit = edits[i];
-
-			const originalText = target._str.substr(originalFromIndex, edit.start - originalFromIndex);
-			pieces[2 * i] = originalText;
-			piecesTextLength += originalText.length;
-
-			originalFromIndex = edit.start + edit.length;
-			pieces[2 * i + 1] = edit.text;
-			piecesTextLength += edit.text.length;
-		}
-
-		// maintain the chars that survive to the right of the last edit
-		let text = target._str.substr(originalFromIndex, originalCharsLength - originalFromIndex);
-		pieces[2 * editsSize] = text;
-		piecesTextLength += text.length;
-
-		let targetDataLength = piecesTextLength > maxLeafLength ? idealLeafLength : piecesTextLength;
-		let targetDataOffset = 0;
-
-		let data: string = '';
-
-		for (let pieceIndex = 0, pieceCount = pieces.length; pieceIndex < pieceCount; pieceIndex++) {
-			const pieceText = pieces[pieceIndex];
-			const pieceLength = pieceText.length;
-			if (pieceLength === 0) {
-				continue;
-			}
-
-			let pieceOffset = 0;
-			while (pieceOffset < pieceLength) {
-				if (targetDataOffset >= targetDataLength) {
-					result.push(new BufferPiece(data));
-					targetDataLength = piecesTextLength > maxLeafLength ? idealLeafLength : piecesTextLength;
-					targetDataOffset = 0;
-					data = '';
-				}
-
-				let writingCnt = min(pieceLength - pieceOffset, targetDataLength - targetDataOffset);
-				data += pieceText.substr(pieceOffset, writingCnt);
-				pieceOffset += writingCnt;
-				targetDataOffset += writingCnt;
-				piecesTextLength -= writingCnt;
-
-				// check that the buffer piece does not end in a \r or high surrogate
-				if (targetDataOffset === targetDataLength && piecesTextLength > 0) {
-					const lastChar = data.charCodeAt(targetDataLength - 1);
-					if (lastChar === CharCode.CarriageReturn || (0xD800 <= lastChar && lastChar <= 0xDBFF)) {
-						// move lastChar over to next buffer piece
-						targetDataLength -= 1;
-						pieceOffset -= 1;
-						targetDataOffset -= 1;
-						piecesTextLength += 1;
-						data = data.substr(0, data.length - 1);
-					}
-				}
-			}
-		}
-
-		result.push(new BufferPiece(data));
-	}
-}
-
-function min(a: number, b: number): number {
-	return (a < b ? a : b);
-}
-
-export function createUint32Array(arr: number[]): Uint32Array {
-	let r = new Uint32Array(arr.length);
-	r.set(arr, 0);
-	return r;
-}
-
-export class LineStarts {
-	constructor(
-		public readonly lineStarts: Uint32Array,
-		public readonly cr: number,
-		public readonly lf: number,
-		public readonly crlf: number,
-		public readonly isBasicASCII: boolean
-	) { }
-}
-
-export function createLineStartsFast(str: string): Uint32Array {
-	let r: number[] = [], rLength = 0;
-	for (let i = 0, len = str.length; i < len; i++) {
-		const chr = str.charCodeAt(i);
-
-		if (chr === CharCode.CarriageReturn) {
-			if (i + 1 < len && str.charCodeAt(i + 1) === CharCode.LineFeed) {
-				// \r\n... case
-				r[rLength++] = i + 2;
-				i++; // skip \n
-			} else {
-				// \r... case
-				r[rLength++] = i + 1;
-			}
-		} else if (chr === CharCode.LineFeed) {
-			r[rLength++] = i + 1;
-		}
-	}
-	return createUint32Array(r);
-}
-
-export function createLineStarts(r: number[], str: string): LineStarts {
-	r.length = 0;
-
-	let rLength = 0;
-	let cr = 0, lf = 0, crlf = 0;
-	let isBasicASCII = true;
-	for (let i = 0, len = str.length; i < len; i++) {
-		const chr = str.charCodeAt(i);
-
-		if (chr === CharCode.CarriageReturn) {
-			if (i + 1 < len && str.charCodeAt(i + 1) === CharCode.LineFeed) {
-				// \r\n... case
-				crlf++;
-				r[rLength++] = i + 2;
-				i++; // skip \n
-			} else {
-				cr++;
-				// \r... case
-				r[rLength++] = i + 1;
-			}
-		} else if (chr === CharCode.LineFeed) {
-			lf++;
-			r[rLength++] = i + 1;
-		} else {
-			if (isBasicASCII) {
-				if (chr !== CharCode.Tab && (chr < 32 || chr > 126)) {
-					isBasicASCII = false;
-				}
-			}
-		}
-	}
-
-	const result = new LineStarts(createUint32Array(r), cr, lf, crlf, isBasicASCII);
-	r.length = 0;
-
-	return result;
-}
diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
deleted file mode 100644
index 046f3387ea5..00000000000
--- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
+++ /dev/null
@@ -1,1526 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { CharCode } from 'vs/base/common/charCode';
-import { ITextBuffer, EndOfLinePreference, IIdentifiedSingleEditOperation, ApplyEditsResult, ISingleEditOperationIdentifier, IInternalModelContentChange } from 'vs/editor/common/model';
-import { BufferPiece, LeafOffsetLenEdit } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import * as strings from 'vs/base/common/strings';
-import { ITextSnapshot } from 'vs/platform/files/common/files';
-
-export interface IValidatedEditOperation {
-	sortIndex: number;
-	identifier: ISingleEditOperationIdentifier;
-	range: Range;
-	rangeOffset: number;
-	rangeLength: number;
-	lines: string[];
-	forceMoveMarkers: boolean;
-	isAutoWhitespaceEdit: boolean;
-}
-
-export class ChunksTextBuffer implements ITextBuffer {
-
-	private _BOM: string;
-	private _actual: Buffer;
-	private _mightContainRTL: boolean;
-	private _mightContainNonBasicASCII: boolean;
-
-	constructor(pieces: BufferPiece[], _averageChunkSize: number, BOM: string, eol: '\r\n' | '\n', containsRTL: boolean, isBasicASCII: boolean) {
-		this._BOM = BOM;
-		const averageChunkSize = Math.floor(Math.min(65536.0, Math.max(128.0, _averageChunkSize)));
-		const delta = Math.floor(averageChunkSize / 3);
-		const min = averageChunkSize - delta;
-		const max = 2 * min;
-		this._actual = new Buffer(pieces, min, max, eol);
-		this._mightContainRTL = containsRTL;
-		this._mightContainNonBasicASCII = !isBasicASCII;
-	}
-
-	equals(other: ITextBuffer): boolean {
-		if (!(other instanceof ChunksTextBuffer)) {
-			return false;
-		}
-		return this._actual.equals(other._actual);
-	}
-	mightContainRTL(): boolean {
-		return this._mightContainRTL;
-	}
-	mightContainNonBasicASCII(): boolean {
-		return this._mightContainNonBasicASCII;
-	}
-	getBOM(): string {
-		return this._BOM;
-	}
-	getEOL(): string {
-		return this._actual.getEOL();
-	}
-	getOffsetAt(lineNumber: number, column: number): number {
-		return this._actual.convertPositionToOffset(lineNumber, column);
-	}
-	getPositionAt(offset: number): Position {
-		return this._actual.convertOffsetToPosition(offset);
-	}
-	getRangeAt(offset: number, length: number): Range {
-		return this._actual.convertOffsetLenToRange(offset, length);
-	}
-	getValueInRange(range: Range, eol: EndOfLinePreference): string {
-		if (range.isEmpty()) {
-			return '';
-		}
-
-		const text = this._actual.getValueInRange(range);
-		switch (eol) {
-			case EndOfLinePreference.TextDefined:
-				return text;
-			case EndOfLinePreference.LF:
-				if (this.getEOL() === '\n') {
-					return text;
-				} else {
-					return text.replace(/\r\n/g, '\n');
-				}
-			case EndOfLinePreference.CRLF:
-				if (this.getEOL() === '\r\n') {
-					return text;
-				} else {
-					return text.replace(/\n/g, '\r\n');
-				}
-		}
-		return null;
-	}
-
-	public createSnapshot(preserveBOM: boolean): ITextSnapshot {
-		return this._actual.createSnapshot(preserveBOM ? this._BOM : '');
-	}
-
-	getValueLengthInRange(range: Range, eol: EndOfLinePreference): number {
-		if (range.isEmpty()) {
-			return 0;
-		}
-		const eolCount = range.endLineNumber - range.startLineNumber;
-		const result = this._actual.getValueLengthInRange(range);
-		switch (eol) {
-			case EndOfLinePreference.TextDefined:
-				return result;
-			case EndOfLinePreference.LF:
-				if (this.getEOL() === '\n') {
-					return result;
-				} else {
-					return result - eolCount; // \r\n => \n
-				}
-			case EndOfLinePreference.CRLF:
-				if (this.getEOL() === '\r\n') {
-					return result;
-				} else {
-					return result + eolCount; // \n => \r\n
-				}
-		}
-		return 0;
-	}
-
-	public getLength(): number {
-		return this._actual.getLength();
-	}
-
-	getLineCount(): number {
-		return this._actual.getLineCount();
-	}
-
-	getLinesContent(): string[] {
-		return this._actual.getLinesContent();
-	}
-
-	getLineContent(lineNumber: number): string {
-		return this._actual.getLineContent(lineNumber);
-	}
-
-	getLineCharCode(lineNumber: number, index: number): number {
-		return this._actual.getLineCharCode(lineNumber, index);
-	}
-
-	getLineLength(lineNumber: number): number {
-		return this._actual.getLineLength(lineNumber);
-	}
-
-	getLineFirstNonWhitespaceColumn(lineNumber: number): number {
-		const result = this._actual.getLineFirstNonWhitespaceIndex(lineNumber);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 1;
-	}
-	getLineLastNonWhitespaceColumn(lineNumber: number): number {
-		const result = this._actual.getLineLastNonWhitespaceIndex(lineNumber);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 1;
-	}
-	setEOL(newEOL: '\r\n' | '\n'): void {
-		if (this.getEOL() === newEOL) {
-			// nothing to do...
-			return;
-		}
-		this._actual.setEOL(newEOL);
-	}
-
-	private static _sortOpsAscending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return a.sortIndex - b.sortIndex;
-		}
-		return r;
-	}
-
-	private static _sortOpsDescending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return b.sortIndex - a.sortIndex;
-		}
-		return -r;
-	}
-
-	applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult {
-		if (rawOperations.length === 0) {
-			return new ApplyEditsResult([], [], []);
-		}
-
-		let mightContainRTL = this._mightContainRTL;
-		let mightContainNonBasicASCII = this._mightContainNonBasicASCII;
-		let canReduceOperations = true;
-
-		let operations: IValidatedEditOperation[] = [];
-		for (let i = 0; i < rawOperations.length; i++) {
-			let op = rawOperations[i];
-			if (canReduceOperations && op._isTracked) {
-				canReduceOperations = false;
-			}
-			let validatedRange = op.range;
-			if (!mightContainRTL && op.text) {
-				// check if the new inserted text contains RTL
-				mightContainRTL = strings.containsRTL(op.text);
-			}
-			if (!mightContainNonBasicASCII && op.text) {
-				mightContainNonBasicASCII = !strings.isBasicASCII(op.text);
-			}
-			operations[i] = {
-				sortIndex: i,
-				identifier: op.identifier || null,
-				range: validatedRange,
-				rangeOffset: this.getOffsetAt(validatedRange.startLineNumber, validatedRange.startColumn),
-				rangeLength: this.getValueLengthInRange(validatedRange, EndOfLinePreference.TextDefined),
-				lines: op.text ? op.text.split(/\r\n|\r|\n/) : null,
-				forceMoveMarkers: op.forceMoveMarkers || false,
-				isAutoWhitespaceEdit: op.isAutoWhitespaceEdit || false
-			};
-		}
-
-		// Sort operations ascending
-		operations.sort(ChunksTextBuffer._sortOpsAscending);
-
-		for (let i = 0, count = operations.length - 1; i < count; i++) {
-			let rangeEnd = operations[i].range.getEndPosition();
-			let nextRangeStart = operations[i + 1].range.getStartPosition();
-
-			if (nextRangeStart.isBefore(rangeEnd)) {
-				// overlapping ranges
-				throw new Error('Overlapping ranges are not allowed!');
-			}
-		}
-
-		if (canReduceOperations) {
-			operations = this._reduceOperations(operations);
-		}
-
-		// Delta encode operations
-		let reverseRanges = ChunksTextBuffer._getInverseEditRanges(operations);
-		let newTrimAutoWhitespaceCandidates: { lineNumber: number, oldContent: string }[] = [];
-
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			if (recordTrimAutoWhitespace && op.isAutoWhitespaceEdit && op.range.isEmpty()) {
-				// Record already the future line numbers that might be auto whitespace removal candidates on next edit
-				for (let lineNumber = reverseRange.startLineNumber; lineNumber <= reverseRange.endLineNumber; lineNumber++) {
-					let currentLineContent = '';
-					if (lineNumber === reverseRange.startLineNumber) {
-						currentLineContent = this.getLineContent(op.range.startLineNumber);
-						if (strings.firstNonWhitespaceIndex(currentLineContent) !== -1) {
-							continue;
-						}
-					}
-					newTrimAutoWhitespaceCandidates.push({ lineNumber: lineNumber, oldContent: currentLineContent });
-				}
-			}
-		}
-
-		let reverseOperations: IIdentifiedSingleEditOperation[] = [];
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			reverseOperations[i] = {
-				identifier: op.identifier,
-				range: reverseRange,
-				text: this.getValueInRange(op.range, EndOfLinePreference.TextDefined),
-				forceMoveMarkers: op.forceMoveMarkers
-			};
-		}
-
-		this._mightContainRTL = mightContainRTL;
-		this._mightContainNonBasicASCII = mightContainNonBasicASCII;
-
-		const contentChanges = this._doApplyEdits(operations);
-
-		let trimAutoWhitespaceLineNumbers: number[] = null;
-		if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) {
-			// sort line numbers auto whitespace removal candidates for next edit descending
-			newTrimAutoWhitespaceCandidates.sort((a, b) => b.lineNumber - a.lineNumber);
-
-			trimAutoWhitespaceLineNumbers = [];
-			for (let i = 0, len = newTrimAutoWhitespaceCandidates.length; i < len; i++) {
-				let lineNumber = newTrimAutoWhitespaceCandidates[i].lineNumber;
-				if (i > 0 && newTrimAutoWhitespaceCandidates[i - 1].lineNumber === lineNumber) {
-					// Do not have the same line number twice
-					continue;
-				}
-
-				let prevContent = newTrimAutoWhitespaceCandidates[i].oldContent;
-				let lineContent = this.getLineContent(lineNumber);
-
-				if (lineContent.length === 0 || lineContent === prevContent || strings.firstNonWhitespaceIndex(lineContent) !== -1) {
-					continue;
-				}
-
-				trimAutoWhitespaceLineNumbers.push(lineNumber);
-			}
-		}
-
-		return new ApplyEditsResult(
-			reverseOperations,
-			contentChanges,
-			trimAutoWhitespaceLineNumbers
-		);
-	}
-
-	/**
-	 * Transform operations such that they represent the same logic edit,
-	 * but that they also do not cause OOM crashes.
-	 */
-	private _reduceOperations(operations: IValidatedEditOperation[]): IValidatedEditOperation[] {
-		if (operations.length < 1000) {
-			// We know from empirical testing that a thousand edits work fine regardless of their shape.
-			return operations;
-		}
-
-		// At one point, due to how events are emitted and how each operation is handled,
-		// some operations can trigger a high ammount of temporary string allocations,
-		// that will immediately get edited again.
-		// e.g. a formatter inserting ridiculous ammounts of \n on a model with a single line
-		// Therefore, the strategy is to collapse all the operations into a huge single edit operation
-		return [this._toSingleEditOperation(operations)];
-	}
-
-	_toSingleEditOperation(operations: IValidatedEditOperation[]): IValidatedEditOperation {
-		let forceMoveMarkers = false,
-			firstEditRange = operations[0].range,
-			lastEditRange = operations[operations.length - 1].range,
-			entireEditRange = new Range(firstEditRange.startLineNumber, firstEditRange.startColumn, lastEditRange.endLineNumber, lastEditRange.endColumn),
-			lastEndLineNumber = firstEditRange.startLineNumber,
-			lastEndColumn = firstEditRange.startColumn,
-			result: string[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let operation = operations[i],
-				range = operation.range;
-
-			forceMoveMarkers = forceMoveMarkers || operation.forceMoveMarkers;
-
-			// (1) -- Push old text
-			for (let lineNumber = lastEndLineNumber; lineNumber < range.startLineNumber; lineNumber++) {
-				if (lineNumber === lastEndLineNumber) {
-					result.push(this.getLineContent(lineNumber).substring(lastEndColumn - 1));
-				} else {
-					result.push('\n');
-					result.push(this.getLineContent(lineNumber));
-				}
-			}
-
-			if (range.startLineNumber === lastEndLineNumber) {
-				result.push(this.getLineContent(range.startLineNumber).substring(lastEndColumn - 1, range.startColumn - 1));
-			} else {
-				result.push('\n');
-				result.push(this.getLineContent(range.startLineNumber).substring(0, range.startColumn - 1));
-			}
-
-			// (2) -- Push new text
-			if (operation.lines) {
-				for (let j = 0, lenJ = operation.lines.length; j < lenJ; j++) {
-					if (j !== 0) {
-						result.push('\n');
-					}
-					result.push(operation.lines[j]);
-				}
-			}
-
-			lastEndLineNumber = operation.range.endLineNumber;
-			lastEndColumn = operation.range.endColumn;
-		}
-
-		return {
-			sortIndex: 0,
-			identifier: operations[0].identifier,
-			range: entireEditRange,
-			rangeOffset: this.getOffsetAt(entireEditRange.startLineNumber, entireEditRange.startColumn),
-			rangeLength: this.getValueLengthInRange(entireEditRange, EndOfLinePreference.TextDefined),
-			lines: result.join('').split('\n'),
-			forceMoveMarkers: forceMoveMarkers,
-			isAutoWhitespaceEdit: false
-		};
-	}
-
-	private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] {
-
-		// Sort operations descending
-		operations.sort(ChunksTextBuffer._sortOpsDescending);
-
-		let contentChanges: IInternalModelContentChange[] = [];
-		let edits: OffsetLenEdit[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			const op = operations[i];
-
-			const text = (op.lines ? op.lines.join(this.getEOL()) : '');
-			edits[i] = new OffsetLenEdit(op.sortIndex, op.rangeOffset, op.rangeLength, text);
-
-			const startLineNumber = op.range.startLineNumber;
-			const startColumn = op.range.startColumn;
-			const endLineNumber = op.range.endLineNumber;
-			const endColumn = op.range.endColumn;
-
-			if (startLineNumber === endLineNumber && startColumn === endColumn && (!op.lines || op.lines.length === 0)) {
-				// no-op
-				continue;
-			}
-
-			contentChanges.push({
-				range: op.range,
-				rangeLength: op.rangeLength,
-				text: text,
-				rangeOffset: op.rangeOffset,
-				forceMoveMarkers: op.forceMoveMarkers
-			});
-		}
-
-		this._actual.replaceOffsetLen(edits);
-
-		return contentChanges;
-	}
-
-	/**
-	 * Assumes `operations` are validated and sorted ascending
-	 */
-	public static _getInverseEditRanges(operations: IValidatedEditOperation[]): Range[] {
-		let result: Range[] = [];
-
-		let prevOpEndLineNumber: number;
-		let prevOpEndColumn: number;
-		let prevOp: IValidatedEditOperation = null;
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let op = operations[i];
-
-			let startLineNumber: number;
-			let startColumn: number;
-
-			if (prevOp) {
-				if (prevOp.range.endLineNumber === op.range.startLineNumber) {
-					startLineNumber = prevOpEndLineNumber;
-					startColumn = prevOpEndColumn + (op.range.startColumn - prevOp.range.endColumn);
-				} else {
-					startLineNumber = prevOpEndLineNumber + (op.range.startLineNumber - prevOp.range.endLineNumber);
-					startColumn = op.range.startColumn;
-				}
-			} else {
-				startLineNumber = op.range.startLineNumber;
-				startColumn = op.range.startColumn;
-			}
-
-			let resultRange: Range;
-
-			if (op.lines && op.lines.length > 0) {
-				// the operation inserts something
-				let lineCount = op.lines.length;
-				let firstLine = op.lines[0];
-				let lastLine = op.lines[lineCount - 1];
-
-				if (lineCount === 1) {
-					// single line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn + firstLine.length);
-				} else {
-					// multi line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber + lineCount - 1, lastLine.length + 1);
-				}
-			} else {
-				// There is nothing to insert
-				resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn);
-			}
-
-			prevOpEndLineNumber = resultRange.endLineNumber;
-			prevOpEndColumn = resultRange.endColumn;
-
-			result.push(resultRange);
-			prevOp = op;
-		}
-
-		return result;
-	}
-}
-
-
-class BufferNodes {
-
-	public length: Uint32Array;
-	public newLineCount: Uint32Array;
-
-	constructor(count: number) {
-		this.length = new Uint32Array(count);
-		this.newLineCount = new Uint32Array(count);
-	}
-
-}
-
-class BufferCursor {
-	constructor(
-		public offset: number,
-		public leafIndex: number,
-		public leafStartOffset: number,
-		public leafStartNewLineCount: number
-	) { }
-
-	public set(offset: number, leafIndex: number, leafStartOffset: number, leafStartNewLineCount: number) {
-		this.offset = offset;
-		this.leafIndex = leafIndex;
-		this.leafStartOffset = leafStartOffset;
-		this.leafStartNewLineCount = leafStartNewLineCount;
-	}
-}
-
-class OffsetLenEdit {
-	constructor(
-		public readonly initialIndex: number,
-		public readonly offset: number,
-		public length: number,
-		public text: string
-	) { }
-}
-
-class InternalOffsetLenEdit {
-	constructor(
-		public readonly startLeafIndex: number,
-		public readonly startInnerOffset: number,
-		public readonly endLeafIndex: number,
-		public readonly endInnerOffset: number,
-		public text: string
-	) { }
-}
-
-class LeafReplacement {
-	constructor(
-		public readonly startLeafIndex: number,
-		public readonly endLeafIndex: number,
-		public readonly replacements: BufferPiece[]
-	) { }
-}
-
-const BUFFER_CURSOR_POOL_SIZE = 10;
-const BufferCursorPool = new class {
-	private _pool: BufferCursor[];
-	private _len: number;
-
-	constructor() {
-		this._pool = [];
-		for (let i = 0; i < BUFFER_CURSOR_POOL_SIZE; i++) {
-			this._pool[i] = new BufferCursor(0, 0, 0, 0);
-		}
-		this._len = this._pool.length;
-	}
-
-	public put(cursor: BufferCursor): void {
-		if (this._len > this._pool.length) {
-			// oh, well
-			return;
-		}
-		this._pool[this._len++] = cursor;
-	}
-
-	public take(): BufferCursor {
-		if (this._len === 0) {
-			// oh, well
-			console.log(`insufficient BufferCursor pool`);
-			return new BufferCursor(0, 0, 0, 0);
-		}
-		const result = this._pool[this._len - 1];
-		this._pool[this._len--] = null;
-		return result;
-	}
-};
-
-class BufferSnapshot implements ITextSnapshot {
-
-	private readonly _pieces: BufferPiece[];
-	private readonly _piecesLength: number;
-	private readonly _BOM: string;
-	private _piecesIndex: number;
-
-	constructor(pieces: BufferPiece[], BOM: string) {
-		this._pieces = pieces;
-		this._piecesLength = this._pieces.length;
-		this._BOM = BOM;
-		this._piecesIndex = 0;
-	}
-
-	public read(): string {
-		if (this._piecesIndex >= this._piecesLength) {
-			return null;
-		}
-
-		let result: string = null;
-		if (this._piecesIndex === 0) {
-			result = this._BOM + this._pieces[this._piecesIndex].text;
-		} else {
-			result = this._pieces[this._piecesIndex].text;
-		}
-
-		this._piecesIndex++;
-		return result;
-	}
-}
-
-class Buffer {
-
-	private _minLeafLength: number;
-	private _maxLeafLength: number;
-	private _idealLeafLength: number;
-
-	private _eol: '\r\n' | '\n';
-	private _eolLength: number;
-
-	private _leafs: BufferPiece[];
-	private _nodes: BufferNodes;
-	private _nodesCount: number;
-	private _leafsStart: number;
-	private _leafsEnd: number;
-
-	constructor(pieces: BufferPiece[], minLeafLength: number, maxLeafLength: number, eol: '\r\n' | '\n') {
-		if (!(2 * minLeafLength >= maxLeafLength)) {
-			throw new Error(`assertion violation`);
-		}
-
-		this._minLeafLength = minLeafLength;
-		this._maxLeafLength = maxLeafLength;
-		this._idealLeafLength = (minLeafLength + maxLeafLength) >>> 1;
-
-		this._eol = eol;
-		this._eolLength = this._eol.length;
-
-		this._leafs = pieces;
-		this._nodes = null;
-		this._nodesCount = 0;
-		this._leafsStart = 0;
-		this._leafsEnd = 0;
-
-		this._rebuildNodes();
-	}
-
-	equals(other: Buffer): boolean {
-		return Buffer.equals(this, other);
-	}
-
-	private static equals(a: Buffer, b: Buffer): boolean {
-		const aLength = a.getLength();
-		const bLength = b.getLength();
-		if (aLength !== bLength) {
-			return false;
-		}
-		if (a.getLineCount() !== b.getLineCount()) {
-			return false;
-		}
-
-		let remaining = aLength;
-		let aLeafIndex = -1, aLeaf = null, aLeafLength = 0, aLeafRemaining = 0;
-		let bLeafIndex = -1, bLeaf = null, bLeafLength = 0, bLeafRemaining = 0;
-
-		while (remaining > 0) {
-			if (aLeafRemaining === 0) {
-				aLeafIndex++;
-				aLeaf = a._leafs[aLeafIndex];
-				aLeafLength = aLeaf.length();
-				aLeafRemaining = aLeafLength;
-			}
-
-			if (bLeafRemaining === 0) {
-				bLeafIndex++;
-				bLeaf = b._leafs[bLeafIndex];
-				bLeafLength = bLeaf.length();
-				bLeafRemaining = bLeafLength;
-			}
-
-			let consuming = Math.min(aLeafRemaining, bLeafRemaining);
-
-			let aStr = aLeaf.substr(aLeafLength - aLeafRemaining, consuming);
-			let bStr = bLeaf.substr(bLeafLength - bLeafRemaining, consuming);
-
-			if (aStr !== bStr) {
-				return false;
-			}
-
-			remaining -= consuming;
-			aLeafRemaining -= consuming;
-			bLeafRemaining -= consuming;
-		}
-
-		return true;
-	}
-
-	public getEOL(): string {
-		return this._eol;
-	}
-
-	private _rebuildNodes() {
-		const leafsCount = this._leafs.length;
-
-		this._nodesCount = (1 << log2(leafsCount));
-		this._leafsStart = this._nodesCount;
-		this._leafsEnd = this._leafsStart + leafsCount;
-
-		this._nodes = new BufferNodes(this._nodesCount);
-		for (let i = this._nodesCount - 1; i >= 1; i--) {
-			this._updateSingleNode(i);
-		}
-	}
-
-	private _updateSingleNode(nodeIndex: number): void {
-		const left = LEFT_CHILD(nodeIndex);
-		const right = RIGHT_CHILD(nodeIndex);
-
-		let length = 0;
-		let newLineCount = 0;
-
-		if (this.IS_NODE(left)) {
-			length += this._nodes.length[left];
-			newLineCount += this._nodes.newLineCount[left];
-		} else if (this.IS_LEAF(left)) {
-			const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(left)];
-			length += leaf.length();
-			newLineCount += leaf.newLineCount();
-		}
-
-		if (this.IS_NODE(right)) {
-			length += this._nodes.length[right];
-			newLineCount += this._nodes.newLineCount[right];
-		} else if (this.IS_LEAF(right)) {
-			const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(right)];
-			length += leaf.length();
-			newLineCount += leaf.newLineCount();
-		}
-
-		this._nodes.length[nodeIndex] = length;
-		this._nodes.newLineCount[nodeIndex] = newLineCount;
-	}
-
-	private _findOffset(offset: number, result: BufferCursor): boolean {
-		if (offset > this._nodes.length[1]) {
-			return false;
-		}
-
-		let it = 1;
-		let searchOffset = offset;
-		let leafStartOffset = 0;
-		let leafStartNewLineCount = 0;
-		while (!this.IS_LEAF(it)) {
-			const left = LEFT_CHILD(it);
-			const right = RIGHT_CHILD(it);
-
-			let leftNewLineCount = 0;
-			let leftLength = 0;
-			if (this.IS_NODE(left)) {
-				leftNewLineCount = this._nodes.newLineCount[left];
-				leftLength = this._nodes.length[left];
-			} else if (this.IS_LEAF(left)) {
-				const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(left)];
-				leftNewLineCount = leaf.newLineCount();
-				leftLength = leaf.length();
-			}
-
-			let rightLength = 0;
-			if (this.IS_NODE(right)) {
-				rightLength += this._nodes.length[right];
-			} else if (this.IS_LEAF(right)) {
-				rightLength += this._leafs[this.NODE_TO_LEAF_INDEX(right)].length();
-			}
-
-			if (searchOffset < leftLength || rightLength === 0) {
-				// go left
-				it = left;
-			} else {
-				// go right
-				searchOffset -= leftLength;
-				leafStartOffset += leftLength;
-				leafStartNewLineCount += leftNewLineCount;
-				it = right;
-			}
-		}
-		it = this.NODE_TO_LEAF_INDEX(it);
-
-		result.set(offset, it, leafStartOffset, leafStartNewLineCount);
-		return true;
-	}
-
-	private _findOffsetCloseAfter(offset: number, start: BufferCursor, result: BufferCursor): boolean {
-		if (offset > this._nodes.length[1]) {
-			return false;
-		}
-
-		let innerOffset = offset - start.leafStartOffset;
-		const leafsCount = this._leafs.length;
-
-		let leafIndex = start.leafIndex;
-		let leafStartOffset = start.leafStartOffset;
-		let leafStartNewLineCount = start.leafStartNewLineCount;
-
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			if (innerOffset < leaf.length() || (innerOffset === leaf.length() && leafIndex + 1 === leafsCount)) {
-				result.set(offset, leafIndex, leafStartOffset, leafStartNewLineCount);
-				return true;
-			}
-
-			leafIndex++;
-
-			if (leafIndex >= leafsCount) {
-				result.set(offset, leafIndex, leafStartOffset, leafStartNewLineCount);
-				return true;
-			}
-
-			leafStartOffset += leaf.length();
-			leafStartNewLineCount += leaf.newLineCount();
-			innerOffset -= leaf.length();
-		}
-	}
-
-	private _findLineStart(lineNumber: number, result: BufferCursor): boolean {
-		let lineIndex = lineNumber - 1;
-		if (lineIndex < 0 || lineIndex > this._nodes.newLineCount[1]) {
-			result.set(0, 0, 0, 0);
-			return false;
-		}
-
-		let it = 1;
-		let leafStartOffset = 0;
-		let leafStartNewLineCount = 0;
-		while (!this.IS_LEAF(it)) {
-			const left = LEFT_CHILD(it);
-			const right = RIGHT_CHILD(it);
-
-			let leftNewLineCount = 0;
-			let leftLength = 0;
-			if (this.IS_NODE(left)) {
-				leftNewLineCount = this._nodes.newLineCount[left];
-				leftLength = this._nodes.length[left];
-			} else if (this.IS_LEAF(left)) {
-				const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(left)];
-				leftNewLineCount = leaf.newLineCount();
-				leftLength = leaf.length();
-			}
-
-			if (lineIndex <= leftNewLineCount) {
-				// go left
-				it = left;
-				continue;
-			}
-
-			// go right
-			lineIndex -= leftNewLineCount;
-			leafStartOffset += leftLength;
-			leafStartNewLineCount += leftNewLineCount;
-			it = right;
-		}
-		it = this.NODE_TO_LEAF_INDEX(it);
-
-		const innerLineStartOffset = (lineIndex === 0 ? 0 : this._leafs[it].lineStartFor(lineIndex - 1));
-
-		result.set(leafStartOffset + innerLineStartOffset, it, leafStartOffset, leafStartNewLineCount);
-		return true;
-	}
-
-	private _findLineEnd(start: BufferCursor, lineNumber: number, result: BufferCursor): void {
-		let innerLineIndex = lineNumber - 1 - start.leafStartNewLineCount;
-		const leafsCount = this._leafs.length;
-
-		let leafIndex = start.leafIndex;
-		let leafStartOffset = start.leafStartOffset;
-		let leafStartNewLineCount = start.leafStartNewLineCount;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			if (innerLineIndex < leaf.newLineCount()) {
-				const lineEndOffset = this._leafs[leafIndex].lineStartFor(innerLineIndex);
-				result.set(leafStartOffset + lineEndOffset, leafIndex, leafStartOffset, leafStartNewLineCount);
-				return;
-			}
-
-			leafIndex++;
-
-			if (leafIndex >= leafsCount) {
-				result.set(leafStartOffset + leaf.length(), leafIndex - 1, leafStartOffset, leafStartNewLineCount);
-				return;
-			}
-
-			leafStartOffset += leaf.length();
-			leafStartNewLineCount += leaf.newLineCount();
-			innerLineIndex = 0;
-		}
-	}
-
-	private _findLine(lineNumber: number, start: BufferCursor, end: BufferCursor): boolean {
-		if (!this._findLineStart(lineNumber, start)) {
-			return false;
-		}
-
-		this._findLineEnd(start, lineNumber, end);
-		return true;
-	}
-
-	public getLength(): number {
-		return this._nodes.length[1];
-	}
-
-	public getLineCount(): number {
-		return this._nodes.newLineCount[1] + 1;
-	}
-
-	public getLineContent(lineNumber: number): string {
-		const start = BufferCursorPool.take();
-		const end = BufferCursorPool.take();
-
-		if (!this._findLine(lineNumber, start, end)) {
-			BufferCursorPool.put(start);
-			BufferCursorPool.put(end);
-			throw new Error(`Line not found`);
-		}
-
-		let result: string;
-		if (lineNumber === this.getLineCount()) {
-			// last line is not trailed by an eol
-			result = this.extractString(start, end.offset - start.offset);
-		} else {
-			result = this.extractString(start, end.offset - start.offset - this._eolLength);
-		}
-
-		BufferCursorPool.put(start);
-		BufferCursorPool.put(end);
-		return result;
-	}
-
-	public getLineCharCode(lineNumber: number, index: number): number {
-		const start = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, start)) {
-			BufferCursorPool.put(start);
-			throw new Error(`Line not found`);
-		}
-
-		const tmp = BufferCursorPool.take();
-		this._findOffsetCloseAfter(start.offset + index, start, tmp);
-		const result = this._leafs[tmp.leafIndex].charCodeAt(tmp.offset - tmp.leafStartNewLineCount);
-		BufferCursorPool.put(tmp);
-
-		BufferCursorPool.put(start);
-		return result;
-	}
-
-	public getLineLength(lineNumber: number): number {
-		const start = BufferCursorPool.take();
-		const end = BufferCursorPool.take();
-
-		if (!this._findLine(lineNumber, start, end)) {
-			BufferCursorPool.put(start);
-			BufferCursorPool.put(end);
-			throw new Error(`Line not found`);
-		}
-
-		let result: number;
-		if (lineNumber === this.getLineCount()) {
-			// last line is not trailed by an eol
-			result = end.offset - start.offset;
-		} else {
-			result = end.offset - start.offset - this._eolLength;
-		}
-
-		BufferCursorPool.put(start);
-		BufferCursorPool.put(end);
-		return result;
-	}
-
-	public getLineFirstNonWhitespaceIndex(lineNumber: number): number {
-		const start = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, start)) {
-			BufferCursorPool.put(start);
-			throw new Error(`Line not found`);
-		}
-
-		let leafIndex = start.leafIndex;
-		let searchStartOffset = start.offset - start.leafStartOffset;
-		BufferCursorPool.put(start);
-
-		const leafsCount = this._leafs.length;
-		let totalDelta = 0;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			const leafResult = leaf.findLineFirstNonWhitespaceIndex(searchStartOffset);
-			if (leafResult === -2) {
-				// reached EOL
-				return -1;
-			}
-			if (leafResult !== -1) {
-				return (leafResult - searchStartOffset) + totalDelta;
-			}
-
-			leafIndex++;
-
-			if (leafIndex >= leafsCount) {
-				return -1;
-			}
-
-			totalDelta += (leaf.length() - searchStartOffset);
-			searchStartOffset = 0;
-		}
-	}
-
-	public getLineLastNonWhitespaceIndex(lineNumber: number): number {
-		const start = BufferCursorPool.take();
-		const end = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, start)) {
-			BufferCursorPool.put(start);
-			BufferCursorPool.put(end);
-			throw new Error(`Line not found`);
-		}
-
-		this._findLineEnd(start, lineNumber, end);
-
-		const startOffset = start.offset;
-		const endOffset = end.offset;
-		let leafIndex = end.leafIndex;
-		let searchStartOffset = end.offset - end.leafStartOffset - this._eolLength;
-
-		BufferCursorPool.put(start);
-		BufferCursorPool.put(end);
-
-		let totalDelta = 0;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			const leafResult = leaf.findLineLastNonWhitespaceIndex(searchStartOffset);
-			if (leafResult === -2) {
-				// reached EOL
-				return -1;
-			}
-			if (leafResult !== -1) {
-				const delta = (searchStartOffset - 1 - leafResult);
-				const absoluteOffset = (endOffset - this._eolLength) - delta - totalDelta;
-				return absoluteOffset - startOffset;
-			}
-
-			leafIndex--;
-
-			if (leafIndex < 0) {
-				return -1;
-			}
-
-			totalDelta += searchStartOffset;
-			searchStartOffset = leaf.length();
-		}
-	}
-
-	public getLinesContent(): string[] {
-		let result: string[] = new Array<string>(this.getLineCount());
-		let resultIndex = 0;
-
-		let currentLine = '';
-		for (let leafIndex = 0, leafsCount = this._leafs.length; leafIndex < leafsCount; leafIndex++) {
-			const leaf = this._leafs[leafIndex];
-			const leafNewLineCount = leaf.newLineCount();
-
-			if (leafNewLineCount === 0) {
-				// special case => push entire leaf text
-				currentLine += leaf.text;
-				continue;
-			}
-
-			let leafSubstrOffset = 0;
-			for (let newLineIndex = 0; newLineIndex < leafNewLineCount; newLineIndex++) {
-				const newLineStart = leaf.lineStartFor(newLineIndex);
-				currentLine += leaf.substr(leafSubstrOffset, newLineStart - leafSubstrOffset - this._eolLength);
-				result[resultIndex++] = currentLine;
-
-				currentLine = '';
-				leafSubstrOffset = newLineStart;
-			}
-			currentLine += leaf.substr(leafSubstrOffset, leaf.length());
-		}
-		result[resultIndex++] = currentLine;
-
-		return result;
-	}
-
-	public extractString(start: BufferCursor, len: number): string {
-		if (!(start.offset + len <= this._nodes.length[1])) {
-			throw new Error(`assertion violation`);
-		}
-
-		let innerLeafOffset = start.offset - start.leafStartOffset;
-		let leafIndex = start.leafIndex;
-		let res = '';
-		while (len > 0) {
-			const leaf = this._leafs[leafIndex];
-			const cnt = Math.min(len, leaf.length() - innerLeafOffset);
-			res += leaf.substr(innerLeafOffset, cnt);
-
-			len -= cnt;
-			innerLeafOffset = 0;
-
-			if (len === 0) {
-				break;
-			}
-
-			leafIndex++;
-		}
-		return res;
-	}
-
-	private _getOffsetAt(lineNumber: number, column: number, result: BufferCursor): boolean {
-		const lineStart = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, lineStart)) {
-			BufferCursorPool.put(lineStart);
-			return false;
-		}
-
-		const startOffset = lineStart.offset + column - 1;
-		if (!this._findOffsetCloseAfter(startOffset, lineStart, result)) {
-			BufferCursorPool.put(lineStart);
-			return false;
-		}
-
-		BufferCursorPool.put(lineStart);
-		return true;
-	}
-
-	public convertPositionToOffset(lineNumber: number, column: number): number {
-		const r = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, r)) {
-			BufferCursorPool.put(r);
-			throw new Error(`Position not found`);
-		}
-
-		const result = r.offset + column - 1;
-
-		BufferCursorPool.put(r);
-		return result;
-	}
-
-	/**
-	 * returns `lineNumber`
-	 */
-	private _findLineStartBeforeOffsetInLeaf(offset: number, leafIndex: number, leafStartOffset: number, leafStartNewLineCount: number, result: BufferCursor): number {
-		const leaf = this._leafs[leafIndex];
-		const lineStartIndex = leaf.findLineStartBeforeOffset(offset - leafStartOffset);
-		const lineStartOffset = leafStartOffset + leaf.lineStartFor(lineStartIndex);
-
-		result.set(lineStartOffset, leafIndex, leafStartOffset, leafStartNewLineCount);
-		return leafStartNewLineCount + lineStartIndex + 2;
-	}
-
-	/**
-	 * returns `lineNumber`.
-	 */
-	private _findLineStartBeforeOffset(offset: number, location: BufferCursor, result: BufferCursor): number {
-
-		let leafIndex = location.leafIndex;
-		let leafStartOffset = location.leafStartOffset;
-		let leafStartNewLineCount = location.leafStartNewLineCount;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			if (leaf.newLineCount() >= 1 && leaf.lineStartFor(0) + leafStartOffset <= offset) {
-				// must be in this leaf
-				return this._findLineStartBeforeOffsetInLeaf(offset, leafIndex, leafStartOffset, leafStartNewLineCount, result);
-			}
-
-			// continue looking in previous leaf
-			leafIndex--;
-
-			if (leafIndex < 0) {
-				result.set(0, 0, 0, 0);
-				return 1;
-			}
-
-			leafStartOffset -= this._leafs[leafIndex].length();
-			leafStartNewLineCount -= this._leafs[leafIndex].newLineCount();
-		}
-	}
-
-	public convertOffsetToPosition(offset: number): Position {
-		const r = BufferCursorPool.take();
-		const lineStart = BufferCursorPool.take();
-
-		if (!this._findOffset(offset, r)) {
-			BufferCursorPool.put(r);
-			BufferCursorPool.put(lineStart);
-			throw new Error(`Offset not found`);
-		}
-
-		const lineNumber = this._findLineStartBeforeOffset(offset, r, lineStart);
-		const column = offset - lineStart.offset + 1;
-
-		BufferCursorPool.put(r);
-		BufferCursorPool.put(lineStart);
-
-		return new Position(lineNumber, column);
-	}
-
-	public convertOffsetLenToRange(offset: number, len: number): Range {
-		const r = BufferCursorPool.take();
-		const lineStart = BufferCursorPool.take();
-
-		if (!this._findOffset(offset, r)) {
-			BufferCursorPool.put(r);
-			BufferCursorPool.put(lineStart);
-			throw new Error(`Offset not found`);
-		}
-		const startLineNumber = this._findLineStartBeforeOffset(offset, r, lineStart);
-		const startColumn = offset - lineStart.offset + 1;
-
-		if (!this._findOffset(offset + len, r)) {
-			BufferCursorPool.put(r);
-			BufferCursorPool.put(lineStart);
-			throw new Error(`Offset not found`);
-		}
-		const endLineNumber = this._findLineStartBeforeOffset(offset + len, r, lineStart);
-		const endColumn = offset + len - lineStart.offset + 1;
-
-		BufferCursorPool.put(r);
-		BufferCursorPool.put(lineStart);
-
-		return new Range(startLineNumber, startColumn, endLineNumber, endColumn);
-	}
-
-	public getValueInRange(range: Range): string {
-		const start = BufferCursorPool.take();
-
-		if (!this._getOffsetAt(range.startLineNumber, range.startColumn, start)) {
-			BufferCursorPool.put(start);
-			throw new Error(`Line not found`);
-		}
-
-		const endOffset = this.convertPositionToOffset(range.endLineNumber, range.endColumn);
-		const result = this.extractString(start, endOffset - start.offset);
-
-		BufferCursorPool.put(start);
-		return result;
-	}
-
-	public createSnapshot(BOM: string): ITextSnapshot {
-		return new BufferSnapshot(this._leafs, BOM);
-	}
-
-	public getValueLengthInRange(range: Range): number {
-		const startOffset = this.convertPositionToOffset(range.startLineNumber, range.startColumn);
-		const endOffset = this.convertPositionToOffset(range.endLineNumber, range.endColumn);
-		return endOffset - startOffset;
-	}
-
-	//#region Editing
-
-	private _mergeAdjacentEdits(edits: OffsetLenEdit[]): OffsetLenEdit[] {
-		// Check if we must merge adjacent edits
-		let merged: OffsetLenEdit[] = [], mergedLength = 0;
-		let prev = edits[0];
-		for (let i = 1, len = edits.length; i < len; i++) {
-			const curr = edits[i];
-			if (prev.offset + prev.length === curr.offset) {
-				// merge into `prev`
-				prev.length = prev.length + curr.length;
-				prev.text = prev.text + curr.text;
-			} else {
-				merged[mergedLength++] = prev;
-				prev = curr;
-			}
-		}
-		merged[mergedLength++] = prev;
-
-		return merged;
-	}
-
-	private _resolveEdits(edits: OffsetLenEdit[]): InternalOffsetLenEdit[] {
-		edits = this._mergeAdjacentEdits(edits);
-
-		let result: InternalOffsetLenEdit[] = [];
-		let tmp = new BufferCursor(0, 0, 0, 0);
-		let tmp2 = new BufferCursor(0, 0, 0, 0);
-		for (let i = 0, len = edits.length; i < len; i++) {
-			const edit = edits[i];
-
-			let text = edit.text;
-
-			this._findOffset(edit.offset, tmp);
-			let startLeafIndex = tmp.leafIndex;
-			let startInnerOffset = tmp.offset - tmp.leafStartOffset;
-			if (startInnerOffset > 0) {
-				const startLeaf = this._leafs[startLeafIndex];
-				const charBefore = startLeaf.charCodeAt(startInnerOffset - 1);
-				if (charBefore === CharCode.CarriageReturn) {
-					// include the replacement of \r in the edit
-					text = '\r' + text;
-
-					this._findOffsetCloseAfter(edit.offset - 1, tmp, tmp2);
-					startLeafIndex = tmp2.leafIndex;
-					startInnerOffset = tmp2.offset - tmp2.leafStartOffset;
-					// this._findOffset(edit.offset - 1, tmp);
-					// startLeafIndex = tmp.leafIndex;
-					// startInnerOffset = tmp.offset - tmp.leafStartOffset;
-				}
-			}
-
-			this._findOffset(edit.offset + edit.length, tmp);
-			let endLeafIndex = tmp.leafIndex;
-			let endInnerOffset = tmp.offset - tmp.leafStartOffset;
-			const endLeaf = this._leafs[endLeafIndex];
-			if (endInnerOffset < endLeaf.length()) {
-				const charAfter = endLeaf.charCodeAt(endInnerOffset);
-				if (charAfter === CharCode.LineFeed) {
-					// include the replacement of \n in the edit
-					text = text + '\n';
-
-					this._findOffsetCloseAfter(edit.offset + edit.length + 1, tmp, tmp2);
-					endLeafIndex = tmp2.leafIndex;
-					endInnerOffset = tmp2.offset - tmp2.leafStartOffset;
-					// this._findOffset(edit.offset + edit.length + 1, tmp);
-					// endLeafIndex = tmp.leafIndex;
-					// endInnerOffset = tmp.offset - tmp.leafStartOffset;
-				}
-			}
-
-			result[i] = new InternalOffsetLenEdit(
-				startLeafIndex, startInnerOffset,
-				endLeafIndex, endInnerOffset,
-				text
-			);
-		}
-
-		return result;
-	}
-
-	private _pushLeafReplacement(startLeafIndex: number, endLeafIndex: number, replacements: LeafReplacement[]): LeafReplacement {
-		const res = new LeafReplacement(startLeafIndex, endLeafIndex, []);
-		replacements.push(res);
-		return res;
-	}
-
-	private _flushLeafEdits(accumulatedLeafIndex: number, accumulatedLeafEdits: LeafOffsetLenEdit[], replacements: LeafReplacement[]): void {
-		if (accumulatedLeafEdits.length > 0) {
-			const rep = this._pushLeafReplacement(accumulatedLeafIndex, accumulatedLeafIndex, replacements);
-			BufferPiece.replaceOffsetLen(this._leafs[accumulatedLeafIndex], accumulatedLeafEdits, this._idealLeafLength, this._maxLeafLength, rep.replacements);
-		}
-		accumulatedLeafEdits.length = 0;
-	}
-
-	private _pushLeafEdits(start: number, length: number, text: string, accumulatedLeafEdits: LeafOffsetLenEdit[]): void {
-		if (length !== 0 || text.length !== 0) {
-			accumulatedLeafEdits.push(new LeafOffsetLenEdit(start, length, text));
-		}
-	}
-
-	private _appendLeaf(leaf: BufferPiece, leafs: BufferPiece[], prevLeaf: BufferPiece): BufferPiece {
-		if (prevLeaf === null) {
-			leafs.push(leaf);
-			prevLeaf = leaf;
-			return prevLeaf;
-		}
-
-		let prevLeafLength = prevLeaf.length();
-		let currLeafLength = leaf.length();
-
-		if ((prevLeafLength < this._minLeafLength || currLeafLength < this._minLeafLength) && prevLeafLength + currLeafLength <= this._maxLeafLength) {
-			const joinedLeaf = BufferPiece.join(prevLeaf, leaf);
-			leafs[leafs.length - 1] = joinedLeaf;
-			prevLeaf = joinedLeaf;
-			return prevLeaf;
-		}
-
-		const lastChar = prevLeaf.charCodeAt(prevLeafLength - 1);
-		const firstChar = leaf.charCodeAt(0);
-
-		if (
-			(lastChar >= 0xd800 && lastChar <= 0xdbff) || (lastChar === CharCode.CarriageReturn && firstChar === CharCode.LineFeed)
-		) {
-			const modifiedPrevLeaf = BufferPiece.deleteLastChar(prevLeaf);
-			leafs[leafs.length - 1] = modifiedPrevLeaf;
-
-			const modifiedLeaf = BufferPiece.insertFirstChar(leaf, lastChar);
-			leaf = modifiedLeaf;
-		}
-
-		leafs.push(leaf);
-		prevLeaf = leaf;
-		return prevLeaf;
-	}
-
-	private static _compareEdits(a: OffsetLenEdit, b: OffsetLenEdit): number {
-		if (a.offset === b.offset) {
-			if (a.length === b.length) {
-				return (a.initialIndex - b.initialIndex);
-			}
-			return (a.length - b.length);
-		}
-		return a.offset - b.offset;
-	}
-
-	public replaceOffsetLen(_edits: OffsetLenEdit[]): void {
-		_edits.sort(Buffer._compareEdits);
-
-		const initialLeafLength = this._leafs.length;
-		const edits = this._resolveEdits(_edits);
-
-		let accumulatedLeafIndex = 0;
-		let accumulatedLeafEdits: LeafOffsetLenEdit[] = [];
-		let replacements: LeafReplacement[] = [];
-
-		for (let i = 0, len = edits.length; i < len; i++) {
-			const edit = edits[i];
-
-			const startLeafIndex = edit.startLeafIndex;
-			const endLeafIndex = edit.endLeafIndex;
-
-			if (startLeafIndex !== accumulatedLeafIndex) {
-				this._flushLeafEdits(accumulatedLeafIndex, accumulatedLeafEdits, replacements);
-				accumulatedLeafIndex = startLeafIndex;
-			}
-
-			const leafEditStart = edit.startInnerOffset;
-			const leafEditEnd = (startLeafIndex === endLeafIndex ? edit.endInnerOffset : this._leafs[startLeafIndex].length());
-			this._pushLeafEdits(leafEditStart, leafEditEnd - leafEditStart, edit.text, accumulatedLeafEdits);
-
-			if (startLeafIndex < endLeafIndex) {
-				this._flushLeafEdits(accumulatedLeafIndex, accumulatedLeafEdits, replacements);
-				accumulatedLeafIndex = endLeafIndex;
-
-				// delete leafs in the middle
-				if (startLeafIndex + 1 < endLeafIndex) {
-					this._pushLeafReplacement(startLeafIndex + 1, endLeafIndex - 1, replacements);
-				}
-
-				// delete on last leaf
-				const leafEditStart = 0;
-				const leafEditEnd = edit.endInnerOffset;
-				this._pushLeafEdits(leafEditStart, leafEditEnd - leafEditStart, '', accumulatedLeafEdits);
-			}
-		}
-		this._flushLeafEdits(accumulatedLeafIndex, accumulatedLeafEdits, replacements);
-
-		let leafs: BufferPiece[] = [];
-		let leafIndex = 0;
-		let prevLeaf: BufferPiece = null;
-
-		for (let i = 0, len = replacements.length; i < len; i++) {
-			const replaceStartLeafIndex = replacements[i].startLeafIndex;
-			const replaceEndLeafIndex = replacements[i].endLeafIndex;
-			const innerLeafs = replacements[i].replacements;
-
-			// add leafs to the left of this replace op.
-			while (leafIndex < replaceStartLeafIndex) {
-				prevLeaf = this._appendLeaf(this._leafs[leafIndex], leafs, prevLeaf);
-				leafIndex++;
-			}
-
-			// delete leafs that get replaced.
-			while (leafIndex <= replaceEndLeafIndex) {
-				leafIndex++;
-			}
-
-			// add new leafs.
-			for (let j = 0, lenJ = innerLeafs.length; j < lenJ; j++) {
-				prevLeaf = this._appendLeaf(innerLeafs[j], leafs, prevLeaf);
-			}
-		}
-
-		// add remaining leafs to the right of the last replacement.
-		while (leafIndex < initialLeafLength) {
-			prevLeaf = this._appendLeaf(this._leafs[leafIndex], leafs, prevLeaf);
-			leafIndex++;
-		}
-
-		if (leafs.length === 0) {
-			// don't leave behind an empty leafs array
-			leafs.push(new BufferPiece(''));
-		}
-
-		this._leafs = leafs;
-		this._rebuildNodes();
-	}
-
-	public setEOL(newEOL: '\r\n' | '\n'): void {
-		let leafs: BufferPiece[] = [];
-		for (let i = 0, len = this._leafs.length; i < len; i++) {
-			leafs[i] = BufferPiece.normalizeEOL(this._leafs[i], newEOL);
-		}
-		this._leafs = leafs;
-		this._rebuildNodes();
-		this._eol = newEOL;
-		this._eolLength = this._eol.length;
-	}
-
-	//#endregion
-
-	private IS_NODE(i: number): boolean {
-		return (i < this._nodesCount);
-	}
-	private IS_LEAF(i: number): boolean {
-		return (i >= this._leafsStart && i < this._leafsEnd);
-	}
-	private NODE_TO_LEAF_INDEX(i: number): number {
-		return (i - this._leafsStart);
-	}
-	// private LEAF_TO_NODE_INDEX(i: number): number {
-	// 	return (i + this._leafsStart);
-	// }
-}
-
-function log2(n: number): number {
-	let v = 1;
-	for (let pow = 1; ; pow++) {
-		v = v << 1;
-		if (v >= n) {
-			return pow;
-		}
-	}
-	// return -1;
-}
-
-function LEFT_CHILD(i: number): number {
-	return (i << 1);
-}
-
-function RIGHT_CHILD(i: number): number {
-	return (i << 1) + 1;
-}
diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts
deleted file mode 100644
index 12eaf167b28..00000000000
--- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as strings from 'vs/base/common/strings';
-import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
-import { BufferPiece, createLineStarts } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece';
-import { ChunksTextBuffer } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBuffer';
-import { CharCode } from 'vs/base/common/charCode';
-
-export class TextBufferFactory implements ITextBufferFactory {
-
-	constructor(
-		private readonly _pieces: BufferPiece[],
-		private readonly _averageChunkSize: number,
-		private readonly _BOM: string,
-		private readonly _cr: number,
-		private readonly _lf: number,
-		private readonly _crlf: number,
-		private readonly _containsRTL: boolean,
-		private readonly _isBasicASCII: boolean,
-	) {
-	}
-
-	/**
-	 * if text source is empty or with precisely one line, returns null. No end of line is detected.
-	 * if text source contains more lines ending with '\r\n', returns '\r\n'.
-	 * Otherwise returns '\n'. More lines end with '\n'.
-	 */
-	private _getEOL(defaultEOL: DefaultEndOfLine): '\r\n' | '\n' {
-		const totalEOLCount = this._cr + this._lf + this._crlf;
-		const totalCRCount = this._cr + this._crlf;
-		if (totalEOLCount === 0) {
-			// This is an empty file or a file with precisely one line
-			return (defaultEOL === DefaultEndOfLine.LF ? '\n' : '\r\n');
-		}
-		if (totalCRCount > totalEOLCount / 2) {
-			// More than half of the file contains \r\n ending lines
-			return '\r\n';
-		}
-		// At least one line more ends in \n
-		return '\n';
-	}
-
-	public create(defaultEOL: DefaultEndOfLine): ITextBuffer {
-		const eol = this._getEOL(defaultEOL);
-		let pieces = this._pieces;
-
-		if (
-			(eol === '\r\n' && (this._cr > 0 || this._lf > 0))
-			|| (eol === '\n' && (this._cr > 0 || this._crlf > 0))
-		) {
-			// Normalize pieces
-			for (let i = 0, len = pieces.length; i < len; i++) {
-				pieces[i] = BufferPiece.normalizeEOL(pieces[i], eol);
-			}
-		}
-		return new ChunksTextBuffer(pieces, this._averageChunkSize, this._BOM, eol, this._containsRTL, this._isBasicASCII);
-	}
-
-	public getFirstLineText(lengthLimit: number): string {
-		const firstPiece = this._pieces[0];
-		if (firstPiece.newLineCount() === 0) {
-			return firstPiece.substr(0, lengthLimit);
-		}
-
-		const firstEOLOffset = firstPiece.lineStartFor(0);
-		return firstPiece.substr(0, Math.min(lengthLimit, firstEOLOffset));
-	}
-}
-
-export class ChunksTextBufferBuilder implements ITextBufferBuilder {
-
-	private _rawPieces: BufferPiece[];
-	private _hasPreviousChar: boolean;
-	private _previousChar: number;
-	private _averageChunkSize: number;
-	private _tmpLineStarts: number[];
-
-	private BOM: string;
-	private cr: number;
-	private lf: number;
-	private crlf: number;
-	private containsRTL: boolean;
-	private isBasicASCII: boolean;
-
-	constructor() {
-		this._rawPieces = [];
-		this._hasPreviousChar = false;
-		this._previousChar = 0;
-		this._averageChunkSize = 0;
-		this._tmpLineStarts = [];
-
-		this.BOM = '';
-		this.cr = 0;
-		this.lf = 0;
-		this.crlf = 0;
-		this.containsRTL = false;
-		this.isBasicASCII = true;
-	}
-
-	public acceptChunk(chunk: string): void {
-		if (chunk.length === 0) {
-			return;
-		}
-
-		if (this._rawPieces.length === 0) {
-			if (strings.startsWithUTF8BOM(chunk)) {
-				this.BOM = strings.UTF8_BOM_CHARACTER;
-				chunk = chunk.substr(1);
-			}
-		}
-
-		this._averageChunkSize = (this._averageChunkSize * this._rawPieces.length + chunk.length) / (this._rawPieces.length + 1);
-
-		const lastChar = chunk.charCodeAt(chunk.length - 1);
-		if (lastChar === CharCode.CarriageReturn || (lastChar >= 0xd800 && lastChar <= 0xdbff)) {
-			// last character is \r or a high surrogate => keep it back
-			this._acceptChunk1(chunk.substr(0, chunk.length - 1), false);
-			this._hasPreviousChar = true;
-			this._previousChar = lastChar;
-		} else {
-			this._acceptChunk1(chunk, false);
-			this._hasPreviousChar = false;
-			this._previousChar = lastChar;
-		}
-	}
-
-	private _acceptChunk1(chunk: string, allowEmptyStrings: boolean): void {
-		if (!allowEmptyStrings && chunk.length === 0) {
-			// Nothing to do
-			return;
-		}
-
-		if (this._hasPreviousChar) {
-			this._acceptChunk2(chunk + String.fromCharCode(this._previousChar));
-		} else {
-			this._acceptChunk2(chunk);
-		}
-	}
-
-	private _acceptChunk2(chunk: string): void {
-		const lineStarts = createLineStarts(this._tmpLineStarts, chunk);
-
-		this._rawPieces.push(new BufferPiece(chunk, lineStarts.lineStarts));
-		this.cr += lineStarts.cr;
-		this.lf += lineStarts.lf;
-		this.crlf += lineStarts.crlf;
-
-		if (this.isBasicASCII) {
-			this.isBasicASCII = lineStarts.isBasicASCII;
-		}
-		if (!this.isBasicASCII && !this.containsRTL) {
-			// No need to check if is basic ASCII
-			this.containsRTL = strings.containsRTL(chunk);
-		}
-	}
-
-	public finish(): TextBufferFactory {
-		this._finish();
-		return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.BOM, this.cr, this.lf, this.crlf, this.containsRTL, this.isBasicASCII);
-	}
-
-	private _finish(): void {
-		if (this._rawPieces.length === 0) {
-			// no chunks => forcefully go through accept chunk
-			this._acceptChunk1('', true);
-			return;
-		}
-
-		if (this._hasPreviousChar) {
-			this._hasPreviousChar = false;
-
-			// recreate last chunk
-			const lastPiece = this._rawPieces[this._rawPieces.length - 1];
-			const tmp = new BufferPiece(String.fromCharCode(this._previousChar));
-			const newLastPiece = BufferPiece.join(lastPiece, tmp);
-			this._rawPieces[this._rawPieces.length - 1] = newLastPiece;
-			if (this._previousChar === CharCode.CarriageReturn) {
-				this.cr++;
-			}
-		}
-	}
-}
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index c3881ab2db5..2156fff0083 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -35,12 +35,10 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IStringStream, ITextSnapshot } from 'vs/platform/files/common/files';
 import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
 
 export enum TextBufferType {
 	LinesArray,
-	PieceTree,
-	Chunks
+	PieceTree
 }
 // Here is the master switch for the text buffer implementation:
 export const OPTIONS = {
@@ -51,9 +49,6 @@ function createTextBufferBuilder() {
 	if (OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.PieceTree) {
 		return new PieceTreeTextBufferBuilder();
 	}
-	if (OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.Chunks) {
-		return new ChunksTextBufferBuilder();
-	}
 	return new LinesTextBufferBuilder();
 }
 
diff --git a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
index f466e4d21c8..8ef7124ce16 100644
--- a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
+++ b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
@@ -6,7 +6,6 @@
 import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
 import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
 
 export function doBenchmark<T>(id: string, ts: T[], fn: (t: T) => void) {
 	let columns: string[] = [id];
@@ -57,7 +56,7 @@ export class BenchmarkSuite {
 		for (let i = 0; i < this.benchmarks.length; i++) {
 			let benchmark = this.benchmarks[i];
 			let columns: string[] = [benchmark.name];
-			[new LinesTextBufferBuilder(), new PieceTreeTextBufferBuilder(), new ChunksTextBufferBuilder()].forEach((builder: ITextBufferBuilder) => {
+			[new LinesTextBufferBuilder(), new PieceTreeTextBufferBuilder()].forEach((builder: ITextBufferBuilder) => {
 				let timeDiffTotal = 0.0;
 				for (let j = 0; j < this.iterations; j++) {
 					let factory = benchmark.buildBuffer(builder);
diff --git a/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts b/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts
deleted file mode 100644
index a6cc8f6f22d..00000000000
--- a/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import { BufferPiece } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece';
-
-suite('BufferPiece', () => {
-	test('findLineStartBeforeOffset', () => {
-		let piece = new BufferPiece([
-			'Line1\r\n',
-			'l2\n',
-			'another\r',
-			'and\r\n',
-			'finally\n',
-			'last'
-		].join(''));
-
-		assert.equal(piece.length(), 35);
-		assert.deepEqual(piece.findLineStartBeforeOffset(0), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(1), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(2), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(3), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(4), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(5), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(6), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(7), 0);
-		assert.deepEqual(piece.findLineStartBeforeOffset(8), 0);
-		assert.deepEqual(piece.findLineStartBeforeOffset(9), 0);
-		assert.deepEqual(piece.findLineStartBeforeOffset(10), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(11), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(12), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(13), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(14), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(15), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(16), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(17), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(18), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(19), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(20), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(21), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(22), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(23), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(24), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(25), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(26), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(27), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(28), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(29), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(30), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(31), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(32), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(33), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(34), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(35), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(36), 4);
-	});
-});

From 4af8a64ea6c45e7af69d00cc274f1077ed2828aa Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 12:08:25 +0200
Subject: [PATCH 140/383] Remove LinesTextBuffer

---
 .../model/linesTextBuffer/linesTextBuffer.ts  | 660 ------------------
 .../linesTextBuffer/linesTextBufferBuilder.ts | 139 ----
 .../model/linesTextBuffer/textSource.ts       |  66 --
 .../pieceTreeTextBuffer.ts                    |  20 +-
 src/vs/editor/common/model/textModel.ts       |  19 +-
 .../common/model/benchmark/benchmarkUtils.ts  |   3 +-
 .../model/benchmark/modelbuilder.benchmark.ts |   4 +-
 .../linesTextBuffer/linesTextBuffer.test.ts   |  18 +-
 .../linesTextBufferBuilder.test.ts            | 133 +---
 .../linesTextBufferBuilderAuto.test.ts        |  97 ---
 .../codeEditor/codeEditor.contribution.ts     |   7 -
 11 files changed, 53 insertions(+), 1113 deletions(-)
 delete mode 100644 src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
 delete mode 100644 src/vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder.ts
 delete mode 100644 src/vs/editor/common/model/linesTextBuffer/textSource.ts
 delete mode 100644 src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts

diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
deleted file mode 100644
index 0d03ecd90a0..00000000000
--- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
+++ /dev/null
@@ -1,660 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { Range } from 'vs/editor/common/core/range';
-import { Position } from 'vs/editor/common/core/position';
-import * as strings from 'vs/base/common/strings';
-import * as arrays from 'vs/base/common/arrays';
-import { PrefixSumComputer } from 'vs/editor/common/viewModel/prefixSumComputer';
-import { ISingleEditOperationIdentifier, IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model';
-import { ITextSnapshot } from 'vs/platform/files/common/files';
-
-export interface IValidatedEditOperation {
-	sortIndex: number;
-	identifier: ISingleEditOperationIdentifier;
-	range: Range;
-	rangeOffset: number;
-	rangeLength: number;
-	lines: string[];
-	forceMoveMarkers: boolean;
-	isAutoWhitespaceEdit: boolean;
-}
-
-/**
- * A processed string with its EOL resolved ready to be turned into an editor model.
- */
-export interface ITextSource {
-	/**
-	 * The text split into lines.
-	 */
-	readonly lines: string[];
-	/**
-	 * The BOM (leading character sequence of the file).
-	 */
-	readonly BOM: string;
-	/**
-	 * The end of line sequence.
-	 */
-	readonly EOL: string;
-	/**
-	 * The text contains Unicode characters classified as "R" or "AL".
-	 */
-	readonly containsRTL: boolean;
-	/**
-	 * The text contains only characters inside the ASCII range 32-126 or \t \r \n
-	 */
-	readonly isBasicASCII: boolean;
-}
-
-class LinesTextBufferSnapshot implements ITextSnapshot {
-
-	private readonly _lines: string[];
-	private readonly _linesLength: number;
-	private readonly _eol: string;
-	private readonly _bom: string;
-	private _lineIndex: number;
-
-	constructor(lines: string[], eol: string, bom: string) {
-		this._lines = lines;
-		this._linesLength = this._lines.length;
-		this._eol = eol;
-		this._bom = bom;
-		this._lineIndex = 0;
-	}
-
-	public read(): string {
-		if (this._lineIndex >= this._linesLength) {
-			return null;
-		}
-
-		let result: string = null;
-
-		if (this._lineIndex === 0) {
-			result = this._bom + this._lines[this._lineIndex];
-		} else {
-			result = this._lines[this._lineIndex];
-		}
-
-		this._lineIndex++;
-
-		if (this._lineIndex < this._linesLength) {
-			result += this._eol;
-		}
-
-		return result;
-	}
-}
-
-export class LinesTextBuffer implements ITextBuffer {
-
-	private _lines: string[];
-	private _BOM: string;
-	private _EOL: string;
-	private _mightContainRTL: boolean;
-	private _mightContainNonBasicASCII: boolean;
-	private _lineStarts: PrefixSumComputer;
-
-	constructor(textSource: ITextSource) {
-		this._lines = textSource.lines.slice(0);
-		this._BOM = textSource.BOM;
-		this._EOL = textSource.EOL;
-		this._mightContainRTL = textSource.containsRTL;
-		this._mightContainNonBasicASCII = !textSource.isBasicASCII;
-		this._constructLineStarts();
-	}
-
-	private _constructLineStarts(): void {
-		const eolLength = this._EOL.length;
-		const linesLength = this._lines.length;
-		const lineStartValues = new Uint32Array(linesLength);
-		for (let i = 0; i < linesLength; i++) {
-			lineStartValues[i] = this._lines[i].length + eolLength;
-		}
-		this._lineStarts = new PrefixSumComputer(lineStartValues);
-	}
-
-	public equals(other: ITextBuffer): boolean {
-		if (!(other instanceof LinesTextBuffer)) {
-			return false;
-		}
-		if (this._BOM !== other._BOM) {
-			return false;
-		}
-		if (this._EOL !== other._EOL) {
-			return false;
-		}
-		if (this._lines.length !== other._lines.length) {
-			return false;
-		}
-		for (let i = 0, len = this._lines.length; i < len; i++) {
-			if (this._lines[i] !== other._lines[i]) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public mightContainRTL(): boolean {
-		return this._mightContainRTL;
-	}
-
-	public mightContainNonBasicASCII(): boolean {
-		return this._mightContainNonBasicASCII;
-	}
-
-	public getBOM(): string {
-		return this._BOM;
-	}
-
-	public getEOL(): string {
-		return this._EOL;
-	}
-
-	public getOffsetAt(lineNumber: number, column: number): number {
-		return this._lineStarts.getAccumulatedValue(lineNumber - 2) + column - 1;
-	}
-
-	public getPositionAt(offset: number): Position {
-		offset = Math.floor(offset);
-		offset = Math.max(0, offset);
-
-		let out = this._lineStarts.getIndexOf(offset);
-
-		let lineLength = this._lines[out.index].length;
-
-		// Ensure we return a valid position
-		return new Position(out.index + 1, Math.min(out.remainder + 1, lineLength + 1));
-	}
-
-	public getRangeAt(offset: number, length: number): Range {
-		const startResult = this._lineStarts.getIndexOf(offset);
-		const startLineLength = this._lines[startResult.index].length;
-		const startColumn = Math.min(startResult.remainder + 1, startLineLength + 1);
-
-		const endResult = this._lineStarts.getIndexOf(offset + length);
-		const endLineLength = this._lines[endResult.index].length;
-		const endColumn = Math.min(endResult.remainder + 1, endLineLength + 1);
-
-		return new Range(startResult.index + 1, startColumn, endResult.index + 1, endColumn);
-	}
-
-	private _getEndOfLine(eol: EndOfLinePreference): string {
-		switch (eol) {
-			case EndOfLinePreference.LF:
-				return '\n';
-			case EndOfLinePreference.CRLF:
-				return '\r\n';
-			case EndOfLinePreference.TextDefined:
-				return this.getEOL();
-		}
-		throw new Error('Unknown EOL preference');
-	}
-
-	public getValueInRange(range: Range, eol: EndOfLinePreference): string {
-		if (range.isEmpty()) {
-			return '';
-		}
-
-		if (range.startLineNumber === range.endLineNumber) {
-			return this._lines[range.startLineNumber - 1].substring(range.startColumn - 1, range.endColumn - 1);
-		}
-
-		const lineEnding = this._getEndOfLine(eol);
-		const startLineIndex = range.startLineNumber - 1;
-		const endLineIndex = range.endLineNumber - 1;
-		let resultLines: string[] = [];
-
-		resultLines.push(this._lines[startLineIndex].substring(range.startColumn - 1));
-		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
-			resultLines.push(this._lines[i]);
-		}
-		resultLines.push(this._lines[endLineIndex].substring(0, range.endColumn - 1));
-
-		return resultLines.join(lineEnding);
-	}
-
-	public createSnapshot(preserveBOM: boolean): ITextSnapshot {
-		return new LinesTextBufferSnapshot(this._lines.slice(0), this._EOL, preserveBOM ? this._BOM : '');
-	}
-
-	public getValueLengthInRange(range: Range, eol: EndOfLinePreference): number {
-		if (range.isEmpty()) {
-			return 0;
-		}
-
-		if (range.startLineNumber === range.endLineNumber) {
-			return (range.endColumn - range.startColumn);
-		}
-
-		let startOffset = this.getOffsetAt(range.startLineNumber, range.startColumn);
-		let endOffset = this.getOffsetAt(range.endLineNumber, range.endColumn);
-		return endOffset - startOffset;
-	}
-
-	public getLineCount(): number {
-		return this._lines.length;
-	}
-
-	public getLinesContent(): string[] {
-		return this._lines.slice(0);
-	}
-
-	public getLength(): number {
-		return this._lineStarts.getTotalValue();
-	}
-
-	public getLineContent(lineNumber: number): string {
-		return this._lines[lineNumber - 1];
-	}
-
-	public getLineCharCode(lineNumber: number, index: number): number {
-		return this._lines[lineNumber - 1].charCodeAt(index);
-	}
-
-	public getLineLength(lineNumber: number): number {
-		return this._lines[lineNumber - 1].length;
-	}
-
-	public getLineFirstNonWhitespaceColumn(lineNumber: number): number {
-		const result = strings.firstNonWhitespaceIndex(this._lines[lineNumber - 1]);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 1;
-	}
-
-	public getLineLastNonWhitespaceColumn(lineNumber: number): number {
-		const result = strings.lastNonWhitespaceIndex(this._lines[lineNumber - 1]);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 2;
-	}
-
-	//#region Editing
-
-	public setEOL(newEOL: '\r\n' | '\n'): void {
-		this._EOL = newEOL;
-		this._constructLineStarts();
-	}
-
-	private static _sortOpsAscending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return a.sortIndex - b.sortIndex;
-		}
-		return r;
-	}
-
-	private static _sortOpsDescending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return b.sortIndex - a.sortIndex;
-		}
-		return -r;
-	}
-
-	public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult {
-		if (rawOperations.length === 0) {
-			return new ApplyEditsResult([], [], []);
-		}
-
-		let mightContainRTL = this._mightContainRTL;
-		let mightContainNonBasicASCII = this._mightContainNonBasicASCII;
-		let canReduceOperations = true;
-
-		let operations: IValidatedEditOperation[] = [];
-		for (let i = 0; i < rawOperations.length; i++) {
-			let op = rawOperations[i];
-			if (canReduceOperations && op._isTracked) {
-				canReduceOperations = false;
-			}
-			let validatedRange = op.range;
-			if (!mightContainRTL && op.text) {
-				// check if the new inserted text contains RTL
-				mightContainRTL = strings.containsRTL(op.text);
-			}
-			if (!mightContainNonBasicASCII && op.text) {
-				mightContainNonBasicASCII = !strings.isBasicASCII(op.text);
-			}
-			operations[i] = {
-				sortIndex: i,
-				identifier: op.identifier || null,
-				range: validatedRange,
-				rangeOffset: this.getOffsetAt(validatedRange.startLineNumber, validatedRange.startColumn),
-				rangeLength: this.getValueLengthInRange(validatedRange, EndOfLinePreference.TextDefined),
-				lines: op.text ? op.text.split(/\r\n|\r|\n/) : null,
-				forceMoveMarkers: op.forceMoveMarkers || false,
-				isAutoWhitespaceEdit: op.isAutoWhitespaceEdit || false
-			};
-		}
-
-		// Sort operations ascending
-		operations.sort(LinesTextBuffer._sortOpsAscending);
-
-		for (let i = 0, count = operations.length - 1; i < count; i++) {
-			let rangeEnd = operations[i].range.getEndPosition();
-			let nextRangeStart = operations[i + 1].range.getStartPosition();
-
-			if (nextRangeStart.isBefore(rangeEnd)) {
-				// overlapping ranges
-				throw new Error('Overlapping ranges are not allowed!');
-			}
-		}
-
-		if (canReduceOperations) {
-			operations = this._reduceOperations(operations);
-		}
-
-		// Delta encode operations
-		let reverseRanges = LinesTextBuffer._getInverseEditRanges(operations);
-		let newTrimAutoWhitespaceCandidates: { lineNumber: number, oldContent: string }[] = [];
-
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			if (recordTrimAutoWhitespace && op.isAutoWhitespaceEdit && op.range.isEmpty()) {
-				// Record already the future line numbers that might be auto whitespace removal candidates on next edit
-				for (let lineNumber = reverseRange.startLineNumber; lineNumber <= reverseRange.endLineNumber; lineNumber++) {
-					let currentLineContent = '';
-					if (lineNumber === reverseRange.startLineNumber) {
-						currentLineContent = this.getLineContent(op.range.startLineNumber);
-						if (strings.firstNonWhitespaceIndex(currentLineContent) !== -1) {
-							continue;
-						}
-					}
-					newTrimAutoWhitespaceCandidates.push({ lineNumber: lineNumber, oldContent: currentLineContent });
-				}
-			}
-		}
-
-		let reverseOperations: IIdentifiedSingleEditOperation[] = [];
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			reverseOperations[i] = {
-				identifier: op.identifier,
-				range: reverseRange,
-				text: this.getValueInRange(op.range, EndOfLinePreference.TextDefined),
-				forceMoveMarkers: op.forceMoveMarkers
-			};
-		}
-
-		this._mightContainRTL = mightContainRTL;
-		this._mightContainNonBasicASCII = mightContainNonBasicASCII;
-
-		const contentChanges = this._doApplyEdits(operations);
-
-		let trimAutoWhitespaceLineNumbers: number[] = null;
-		if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) {
-			// sort line numbers auto whitespace removal candidates for next edit descending
-			newTrimAutoWhitespaceCandidates.sort((a, b) => b.lineNumber - a.lineNumber);
-
-			trimAutoWhitespaceLineNumbers = [];
-			for (let i = 0, len = newTrimAutoWhitespaceCandidates.length; i < len; i++) {
-				let lineNumber = newTrimAutoWhitespaceCandidates[i].lineNumber;
-				if (i > 0 && newTrimAutoWhitespaceCandidates[i - 1].lineNumber === lineNumber) {
-					// Do not have the same line number twice
-					continue;
-				}
-
-				let prevContent = newTrimAutoWhitespaceCandidates[i].oldContent;
-				let lineContent = this.getLineContent(lineNumber);
-
-				if (lineContent.length === 0 || lineContent === prevContent || strings.firstNonWhitespaceIndex(lineContent) !== -1) {
-					continue;
-				}
-
-				trimAutoWhitespaceLineNumbers.push(lineNumber);
-			}
-		}
-
-		return new ApplyEditsResult(
-			reverseOperations,
-			contentChanges,
-			trimAutoWhitespaceLineNumbers
-		);
-	}
-
-	/**
-	 * Transform operations such that they represent the same logic edit,
-	 * but that they also do not cause OOM crashes.
-	 */
-	private _reduceOperations(operations: IValidatedEditOperation[]): IValidatedEditOperation[] {
-		if (operations.length < 1000) {
-			// We know from empirical testing that a thousand edits work fine regardless of their shape.
-			return operations;
-		}
-
-		// At one point, due to how events are emitted and how each operation is handled,
-		// some operations can trigger a high ammount of temporary string allocations,
-		// that will immediately get edited again.
-		// e.g. a formatter inserting ridiculous ammounts of \n on a model with a single line
-		// Therefore, the strategy is to collapse all the operations into a huge single edit operation
-		return [this._toSingleEditOperation(operations)];
-	}
-
-	_toSingleEditOperation(operations: IValidatedEditOperation[]): IValidatedEditOperation {
-		let forceMoveMarkers = false,
-			firstEditRange = operations[0].range,
-			lastEditRange = operations[operations.length - 1].range,
-			entireEditRange = new Range(firstEditRange.startLineNumber, firstEditRange.startColumn, lastEditRange.endLineNumber, lastEditRange.endColumn),
-			lastEndLineNumber = firstEditRange.startLineNumber,
-			lastEndColumn = firstEditRange.startColumn,
-			result: string[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let operation = operations[i],
-				range = operation.range;
-
-			forceMoveMarkers = forceMoveMarkers || operation.forceMoveMarkers;
-
-			// (1) -- Push old text
-			for (let lineNumber = lastEndLineNumber; lineNumber < range.startLineNumber; lineNumber++) {
-				if (lineNumber === lastEndLineNumber) {
-					result.push(this._lines[lineNumber - 1].substring(lastEndColumn - 1));
-				} else {
-					result.push('\n');
-					result.push(this._lines[lineNumber - 1]);
-				}
-			}
-
-			if (range.startLineNumber === lastEndLineNumber) {
-				result.push(this._lines[range.startLineNumber - 1].substring(lastEndColumn - 1, range.startColumn - 1));
-			} else {
-				result.push('\n');
-				result.push(this._lines[range.startLineNumber - 1].substring(0, range.startColumn - 1));
-			}
-
-			// (2) -- Push new text
-			if (operation.lines) {
-				for (let j = 0, lenJ = operation.lines.length; j < lenJ; j++) {
-					if (j !== 0) {
-						result.push('\n');
-					}
-					result.push(operation.lines[j]);
-				}
-			}
-
-			lastEndLineNumber = operation.range.endLineNumber;
-			lastEndColumn = operation.range.endColumn;
-		}
-
-		return {
-			sortIndex: 0,
-			identifier: operations[0].identifier,
-			range: entireEditRange,
-			rangeOffset: this.getOffsetAt(entireEditRange.startLineNumber, entireEditRange.startColumn),
-			rangeLength: this.getValueLengthInRange(entireEditRange, EndOfLinePreference.TextDefined),
-			lines: result.join('').split('\n'),
-			forceMoveMarkers: forceMoveMarkers,
-			isAutoWhitespaceEdit: false
-		};
-	}
-
-	private _setLineContent(lineNumber: number, content: string): void {
-		this._lines[lineNumber - 1] = content;
-		this._lineStarts.changeValue(lineNumber - 1, content.length + this._EOL.length);
-	}
-
-	private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] {
-
-		// Sort operations descending
-		operations.sort(LinesTextBuffer._sortOpsDescending);
-
-		let contentChanges: IInternalModelContentChange[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			const op = operations[i];
-
-			const startLineNumber = op.range.startLineNumber;
-			const startColumn = op.range.startColumn;
-			const endLineNumber = op.range.endLineNumber;
-			const endColumn = op.range.endColumn;
-
-			if (startLineNumber === endLineNumber && startColumn === endColumn && (!op.lines || op.lines.length === 0)) {
-				// no-op
-				continue;
-			}
-
-			const deletingLinesCnt = endLineNumber - startLineNumber;
-			const insertingLinesCnt = (op.lines ? op.lines.length - 1 : 0);
-			const editingLinesCnt = Math.min(deletingLinesCnt, insertingLinesCnt);
-
-			for (let j = editingLinesCnt; j >= 0; j--) {
-				const editLineNumber = startLineNumber + j;
-				let editText = (op.lines ? op.lines[j] : '');
-
-				if (editLineNumber === startLineNumber || editLineNumber === endLineNumber) {
-					const editStartColumn = (editLineNumber === startLineNumber ? startColumn : 1);
-					const editEndColumn = (editLineNumber === endLineNumber ? endColumn : this.getLineLength(editLineNumber) + 1);
-
-					editText = (
-						this._lines[editLineNumber - 1].substring(0, editStartColumn - 1)
-						+ editText
-						+ this._lines[editLineNumber - 1].substring(editEndColumn - 1)
-					);
-				}
-
-				this._setLineContent(editLineNumber, editText);
-			}
-
-			if (editingLinesCnt < deletingLinesCnt) {
-				// Must delete some lines
-
-				const spliceStartLineNumber = startLineNumber + editingLinesCnt;
-				const endLineRemains = this._lines[endLineNumber - 1].substring(endColumn - 1);
-
-				// Reconstruct first line
-				this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains);
-
-				this._lines.splice(spliceStartLineNumber, endLineNumber - spliceStartLineNumber);
-				this._lineStarts.removeValues(spliceStartLineNumber, endLineNumber - spliceStartLineNumber);
-			}
-
-			if (editingLinesCnt < insertingLinesCnt) {
-				// Must insert some lines
-
-				const spliceLineNumber = startLineNumber + editingLinesCnt;
-				let spliceColumn = (spliceLineNumber === startLineNumber ? startColumn : 1);
-				if (op.lines) {
-					spliceColumn += op.lines[editingLinesCnt].length;
-				}
-
-				// Split last line
-				const leftoverLine = this._lines[spliceLineNumber - 1].substring(spliceColumn - 1);
-
-				this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1));
-
-				// Lines in the middle
-				let newLines: string[] = new Array<string>(insertingLinesCnt - editingLinesCnt);
-				let newLinesLengths = new Uint32Array(insertingLinesCnt - editingLinesCnt);
-				for (let j = editingLinesCnt + 1; j <= insertingLinesCnt; j++) {
-					newLines[j - editingLinesCnt - 1] = op.lines[j];
-					newLinesLengths[j - editingLinesCnt - 1] = op.lines[j].length + this._EOL.length;
-				}
-				newLines[newLines.length - 1] += leftoverLine;
-				newLinesLengths[newLines.length - 1] += leftoverLine.length;
-				this._lines = arrays.arrayInsert(this._lines, startLineNumber + editingLinesCnt, newLines);
-				this._lineStarts.insertValues(startLineNumber + editingLinesCnt, newLinesLengths);
-			}
-
-			const contentChangeRange = new Range(startLineNumber, startColumn, endLineNumber, endColumn);
-			const text = (op.lines ? op.lines.join(this.getEOL()) : '');
-			contentChanges.push({
-				range: contentChangeRange,
-				rangeLength: op.rangeLength,
-				text: text,
-				rangeOffset: op.rangeOffset,
-				forceMoveMarkers: op.forceMoveMarkers
-			});
-		}
-
-		return contentChanges;
-	}
-
-	/**
-	 * Assumes `operations` are validated and sorted ascending
-	 */
-	public static _getInverseEditRanges(operations: IValidatedEditOperation[]): Range[] {
-		let result: Range[] = [];
-
-		let prevOpEndLineNumber: number;
-		let prevOpEndColumn: number;
-		let prevOp: IValidatedEditOperation = null;
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let op = operations[i];
-
-			let startLineNumber: number;
-			let startColumn: number;
-
-			if (prevOp) {
-				if (prevOp.range.endLineNumber === op.range.startLineNumber) {
-					startLineNumber = prevOpEndLineNumber;
-					startColumn = prevOpEndColumn + (op.range.startColumn - prevOp.range.endColumn);
-				} else {
-					startLineNumber = prevOpEndLineNumber + (op.range.startLineNumber - prevOp.range.endLineNumber);
-					startColumn = op.range.startColumn;
-				}
-			} else {
-				startLineNumber = op.range.startLineNumber;
-				startColumn = op.range.startColumn;
-			}
-
-			let resultRange: Range;
-
-			if (op.lines && op.lines.length > 0) {
-				// the operation inserts something
-				let lineCount = op.lines.length;
-				let firstLine = op.lines[0];
-				let lastLine = op.lines[lineCount - 1];
-
-				if (lineCount === 1) {
-					// single line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn + firstLine.length);
-				} else {
-					// multi line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber + lineCount - 1, lastLine.length + 1);
-				}
-			} else {
-				// There is nothing to insert
-				resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn);
-			}
-
-			prevOpEndLineNumber = resultRange.endLineNumber;
-			prevOpEndColumn = resultRange.endColumn;
-
-			result.push(resultRange);
-			prevOp = op;
-		}
-
-		return result;
-	}
-
-	//#endregion
-}
diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder.ts
deleted file mode 100644
index 3c46fd8d3e1..00000000000
--- a/src/vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as strings from 'vs/base/common/strings';
-import { CharCode } from 'vs/base/common/charCode';
-import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
-import { IRawTextSource, TextSource } from 'vs/editor/common/model/linesTextBuffer/textSource';
-import { LinesTextBuffer } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
-
-export class TextBufferFactory implements ITextBufferFactory {
-
-	constructor(public readonly rawTextSource: IRawTextSource) {
-	}
-
-	public create(defaultEOL: DefaultEndOfLine): ITextBuffer {
-		const textSource = TextSource.fromRawTextSource(this.rawTextSource, defaultEOL);
-		return new LinesTextBuffer(textSource);
-	}
-
-	public getFirstLineText(lengthLimit: number): string {
-		return this.rawTextSource.lines[0].substr(0, lengthLimit);
-	}
-}
-
-class ModelLineBasedBuilder {
-
-	private BOM: string;
-	private lines: string[];
-	private currLineIndex: number;
-
-	constructor() {
-		this.BOM = '';
-		this.lines = [];
-		this.currLineIndex = 0;
-	}
-
-	public acceptLines(lines: string[]): void {
-		if (this.currLineIndex === 0) {
-			// Remove the BOM (if present)
-			if (strings.startsWithUTF8BOM(lines[0])) {
-				this.BOM = strings.UTF8_BOM_CHARACTER;
-				lines[0] = lines[0].substr(1);
-			}
-		}
-
-		for (let i = 0, len = lines.length; i < len; i++) {
-			this.lines[this.currLineIndex++] = lines[i];
-		}
-	}
-
-	public finish(carriageReturnCnt: number, containsRTL: boolean, isBasicASCII: boolean): TextBufferFactory {
-		return new TextBufferFactory({
-			BOM: this.BOM,
-			lines: this.lines,
-			containsRTL: containsRTL,
-			totalCRCount: carriageReturnCnt,
-			isBasicASCII,
-		});
-	}
-}
-
-export class LinesTextBufferBuilder implements ITextBufferBuilder {
-
-	private leftoverPrevChunk: string;
-	private leftoverEndsInCR: boolean;
-	private totalCRCount: number;
-	private lineBasedBuilder: ModelLineBasedBuilder;
-	private containsRTL: boolean;
-	private isBasicASCII: boolean;
-
-	constructor() {
-		this.leftoverPrevChunk = '';
-		this.leftoverEndsInCR = false;
-		this.totalCRCount = 0;
-		this.lineBasedBuilder = new ModelLineBasedBuilder();
-		this.containsRTL = false;
-		this.isBasicASCII = true;
-	}
-
-	private _updateCRCount(chunk: string): void {
-		// Count how many \r are present in chunk to determine the majority EOL sequence
-		let chunkCarriageReturnCnt = 0;
-		let lastCarriageReturnIndex = -1;
-		while ((lastCarriageReturnIndex = chunk.indexOf('\r', lastCarriageReturnIndex + 1)) !== -1) {
-			chunkCarriageReturnCnt++;
-		}
-		this.totalCRCount += chunkCarriageReturnCnt;
-	}
-
-	public acceptChunk(chunk: string): void {
-		if (chunk.length === 0) {
-			return;
-		}
-
-		this._updateCRCount(chunk);
-
-		if (!this.containsRTL) {
-			this.containsRTL = strings.containsRTL(chunk);
-		}
-		if (this.isBasicASCII) {
-			this.isBasicASCII = strings.isBasicASCII(chunk);
-		}
-
-		// Avoid dealing with a chunk that ends in \r (push the \r to the next chunk)
-		if (this.leftoverEndsInCR) {
-			chunk = '\r' + chunk;
-		}
-		if (chunk.charCodeAt(chunk.length - 1) === CharCode.CarriageReturn) {
-			this.leftoverEndsInCR = true;
-			chunk = chunk.substr(0, chunk.length - 1);
-		} else {
-			this.leftoverEndsInCR = false;
-		}
-
-		let lines = chunk.split(/\r\n|\r|\n/);
-
-		if (lines.length === 1) {
-			// no \r or \n encountered
-			this.leftoverPrevChunk += lines[0];
-			return;
-		}
-
-		lines[0] = this.leftoverPrevChunk + lines[0];
-		this.lineBasedBuilder.acceptLines(lines.slice(0, lines.length - 1));
-		this.leftoverPrevChunk = lines[lines.length - 1];
-	}
-
-	public finish(): TextBufferFactory {
-		let finalLines = [this.leftoverPrevChunk];
-		if (this.leftoverEndsInCR) {
-			finalLines.push('');
-		}
-		this.lineBasedBuilder.acceptLines(finalLines);
-		return this.lineBasedBuilder.finish(this.totalCRCount, this.containsRTL, this.isBasicASCII);
-	}
-}
diff --git a/src/vs/editor/common/model/linesTextBuffer/textSource.ts b/src/vs/editor/common/model/linesTextBuffer/textSource.ts
deleted file mode 100644
index 79c06f1c9f1..00000000000
--- a/src/vs/editor/common/model/linesTextBuffer/textSource.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { ITextSource } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
-
-/**
- * A processed string ready to be turned into an editor model.
- */
-export interface IRawTextSource {
-	/**
-	 * The text split into lines.
-	 */
-	readonly lines: string[];
-	/**
-	 * The BOM (leading character sequence of the file).
-	 */
-	readonly BOM: string;
-	/**
-	 * The number of lines ending with '\r\n'
-	 */
-	readonly totalCRCount: number;
-	/**
-	 * The text contains Unicode characters classified as "R" or "AL".
-	 */
-	readonly containsRTL: boolean;
-	/**
-	 * The text contains only characters inside the ASCII range 32-126 or \t \r \n
-	 */
-	readonly isBasicASCII: boolean;
-}
-
-export class TextSource {
-
-	/**
-	 * if text source is empty or with precisely one line, returns null. No end of line is detected.
-	 * if text source contains more lines ending with '\r\n', returns '\r\n'.
-	 * Otherwise returns '\n'. More lines end with '\n'.
-	 */
-	private static _getEOL(rawTextSource: IRawTextSource, defaultEOL: DefaultEndOfLine): '\r\n' | '\n' {
-		const lineFeedCnt = rawTextSource.lines.length - 1;
-		if (lineFeedCnt === 0) {
-			// This is an empty file or a file with precisely one line
-			return (defaultEOL === DefaultEndOfLine.LF ? '\n' : '\r\n');
-		}
-		if (rawTextSource.totalCRCount > lineFeedCnt / 2) {
-			// More than half of the file contains \r\n ending lines
-			return '\r\n';
-		}
-		// At least one line more ends in \n
-		return '\n';
-	}
-
-	public static fromRawTextSource(rawTextSource: IRawTextSource, defaultEOL: DefaultEndOfLine): ITextSource {
-		return {
-			lines: rawTextSource.lines,
-			BOM: rawTextSource.BOM,
-			EOL: TextSource._getEOL(rawTextSource, defaultEOL),
-			containsRTL: rawTextSource.containsRTL,
-			isBasicASCII: rawTextSource.isBasicASCII,
-		};
-	}
-}
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index 3695a9597ab..20f2c79bfa5 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -7,12 +7,22 @@
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import * as strings from 'vs/base/common/strings';
-import { IValidatedEditOperation } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
 import { PieceTreeBase, StringBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
-import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange, FindMatch } from 'vs/editor/common/model';
+import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange, FindMatch, ISingleEditOperationIdentifier } from 'vs/editor/common/model';
 import { ITextSnapshot } from 'vs/platform/files/common/files';
 import { SearchData } from 'vs/editor/common/model/textModelSearch';
 
+export interface IValidatedEditOperation {
+	sortIndex: number;
+	identifier: ISingleEditOperationIdentifier;
+	range: Range;
+	rangeOffset: number;
+	rangeLength: number;
+	lines: string[];
+	forceMoveMarkers: boolean;
+	isAutoWhitespaceEdit: boolean;
+}
+
 export class PieceTreeTextBuffer implements ITextBuffer {
 	private _pieceTree: PieceTreeBase;
 	private _BOM: string;
@@ -279,9 +289,9 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 	}
 
 	/**
- * Transform operations such that they represent the same logic edit,
- * but that they also do not cause OOM crashes.
- */
+	 * Transform operations such that they represent the same logic edit,
+	 * but that they also do not cause OOM crashes.
+	 */
 	private _reduceOperations(operations: IValidatedEditOperation[]): IValidatedEditOperation[] {
 		if (operations.length < 1000) {
 			// We know from empirical testing that a thousand edits work fine regardless of their shape.
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 2156fff0083..2fd6a637aa7 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -33,23 +33,10 @@ import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { TextModelSearch, SearchParams, SearchData } from 'vs/editor/common/model/textModelSearch';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IStringStream, ITextSnapshot } from 'vs/platform/files/common/files';
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 
-export enum TextBufferType {
-	LinesArray,
-	PieceTree
-}
-// Here is the master switch for the text buffer implementation:
-export const OPTIONS = {
-	TEXT_BUFFER_IMPLEMENTATION: TextBufferType.PieceTree
-};
-
 function createTextBufferBuilder() {
-	if (OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.PieceTree) {
-		return new PieceTreeTextBufferBuilder();
-	}
-	return new LinesTextBufferBuilder();
+	return new PieceTreeTextBufferBuilder();
 }
 
 export function createTextBufferFactory(text: string): model.ITextBufferFactory {
@@ -999,7 +986,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 			searchRange = this.getFullModelRange();
 		}
 
-		if (!isRegex && searchString.indexOf('\n') < 0 && OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.PieceTree) {
+		if (!isRegex && searchString.indexOf('\n') < 0) {
 			// not regex, not multi line
 			const searchParams = new SearchParams(searchString, isRegex, matchCase, wordSeparators);
 			const searchData = searchParams.parseSearchRequest();
@@ -1018,7 +1005,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 		this._assertNotDisposed();
 		const searchStart = this.validatePosition(rawSearchStart);
 
-		if (!isRegex && searchString.indexOf('\n') < 0 && OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.PieceTree) {
+		if (!isRegex && searchString.indexOf('\n') < 0) {
 			const searchParams = new SearchParams(searchString, isRegex, matchCase, wordSeparators);
 			const searchData = searchParams.parseSearchRequest();
 			const lineCount = this.getLineCount();
diff --git a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
index 8ef7124ce16..42f00825eac 100644
--- a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
+++ b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 
 export function doBenchmark<T>(id: string, ts: T[], fn: (t: T) => void) {
@@ -56,7 +55,7 @@ export class BenchmarkSuite {
 		for (let i = 0; i < this.benchmarks.length; i++) {
 			let benchmark = this.benchmarks[i];
 			let columns: string[] = [benchmark.name];
-			[new LinesTextBufferBuilder(), new PieceTreeTextBufferBuilder()].forEach((builder: ITextBufferBuilder) => {
+			[new PieceTreeTextBufferBuilder()].forEach((builder: ITextBufferBuilder) => {
 				let timeDiffTotal = 0.0;
 				for (let j = 0; j < this.iterations; j++) {
 					let factory = benchmark.buildBuffer(builder);
diff --git a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts
index 41445a17df9..da57b7089d7 100644
--- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts
@@ -4,13 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { ITextBufferBuilder } from 'vs/editor/common/model';
 import { generateRandomChunkWithLF } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
 import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils';
 
-let linesTextBufferBuilder = new LinesTextBufferBuilder();
 let pieceTreeTextBufferBuilder = new PieceTreeTextBufferBuilder();
 let chunks = [];
 
@@ -30,5 +28,5 @@ let modelBuildBenchmark = function (id: string, builders: ITextBufferBuilder[],
 console.log(`|model builder\t|line buffer\t|piece table\t|`);
 console.log('|---|---|---|');
 for (let i of [10, 100]) {
-	modelBuildBenchmark(`${i} random chunks`, [linesTextBufferBuilder, pieceTreeTextBufferBuilder], i);
+	modelBuildBenchmark(`${i} random chunks`, [pieceTreeTextBufferBuilder], i);
 }
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
index 155bac69a70..3f14797774a 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
@@ -7,9 +7,11 @@
 
 import * as assert from 'assert';
 import { Range } from 'vs/editor/common/core/range';
-import { LinesTextBuffer, IValidatedEditOperation } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
+import { PieceTreeTextBuffer, IValidatedEditOperation } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
+import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
+import { DefaultEndOfLine } from 'vs/editor/common/model';
 
-suite('LinesTextBuffer._getInverseEdits', () => {
+suite('PieceTreeTextBuffer._getInverseEdits', () => {
 
 	function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[]): IValidatedEditOperation {
 		return {
@@ -29,7 +31,7 @@ suite('LinesTextBuffer._getInverseEdits', () => {
 	}
 
 	function assertInverseEdits(ops: IValidatedEditOperation[], expected: Range[]): void {
-		var actual = LinesTextBuffer._getInverseEditRanges(ops);
+		var actual = PieceTreeTextBuffer._getInverseEditRanges(ops);
 		assert.deepEqual(actual, expected);
 	}
 
@@ -260,7 +262,7 @@ suite('LinesTextBuffer._getInverseEdits', () => {
 	});
 });
 
-suite('LinesTextBuffer._toSingleEditOperation', () => {
+suite('PieceTreeTextBuffer._toSingleEditOperation', () => {
 
 	function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, rangeOffset: number, rangeLength: number, text: string[]): IValidatedEditOperation {
 		return {
@@ -276,13 +278,7 @@ suite('LinesTextBuffer._toSingleEditOperation', () => {
 	}
 
 	function testToSingleEditOperation(original: string[], edits: IValidatedEditOperation[], expected: IValidatedEditOperation): void {
-		const textBuffer = new LinesTextBuffer({
-			BOM: '',
-			EOL: '\n',
-			containsRTL: false,
-			isBasicASCII: true,
-			lines: original
-		});
+		const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(original.join('\n')).create(DefaultEndOfLine.LF);
 
 		const actual = textBuffer._toSingleEditOperation(edits);
 		assert.deepEqual(actual, expected);
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
index afae933900b..0291217b61d 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
@@ -5,150 +5,69 @@
 'use strict';
 
 import * as assert from 'assert';
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
-import { ITextModelCreationOptions } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
+import { DefaultEndOfLine } from 'vs/editor/common/model';
+import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import * as strings from 'vs/base/common/strings';
-import { IRawTextSource } from 'vs/editor/common/model/linesTextBuffer/textSource';
+import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
-class RawTextSource {
-	public static fromString(rawText: string): IRawTextSource {
-		// Count the number of lines that end with \r\n
-		let carriageReturnCnt = 0;
-		let lastCarriageReturnIndex = -1;
-		while ((lastCarriageReturnIndex = rawText.indexOf('\r', lastCarriageReturnIndex + 1)) !== -1) {
-			carriageReturnCnt++;
-		}
+export function testTextBufferFactory(text: string, eol: string, mightContainNonBasicASCII: boolean, mightContainRTL: boolean): void {
+	const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(text).create(DefaultEndOfLine.LF);
 
-		const containsRTL = strings.containsRTL(rawText);
-		const isBasicASCII = (containsRTL ? false : strings.isBasicASCII(rawText));
-
-		// Split the text into lines
-		const lines = rawText.split(/\r\n|\r|\n/);
-
-		// Remove the BOM (if present)
-		let BOM = '';
-		if (strings.startsWithUTF8BOM(lines[0])) {
-			BOM = strings.UTF8_BOM_CHARACTER;
-			lines[0] = lines[0].substr(1);
-		}
-
-		return {
-			BOM: BOM,
-			lines: lines,
-			containsRTL: containsRTL,
-			isBasicASCII: isBasicASCII,
-			totalCRCount: carriageReturnCnt
-		};
-	}
-}
-
-export function testModelBuilder(chunks: string[], opts: ITextModelCreationOptions = TextModel.DEFAULT_CREATION_OPTIONS): void {
-	let expectedTextSource = RawTextSource.fromString(chunks.join(''));
-
-	let builder = new LinesTextBufferBuilder();
-	for (let i = 0, len = chunks.length; i < len; i++) {
-		builder.acceptChunk(chunks[i]);
-	}
-	let actual = builder.finish();
-
-	assert.deepEqual(actual.rawTextSource, expectedTextSource);
+	assert.equal(textBuffer.mightContainNonBasicASCII(), mightContainNonBasicASCII);
+	assert.equal(textBuffer.mightContainRTL(), mightContainRTL);
+	assert.equal(textBuffer.getEOL(), eol);
 }
 
 suite('ModelBuilder', () => {
 
-	test('no chunks', () => {
-		testModelBuilder([]);
+	test('t1', () => {
+		testTextBufferFactory('', '\n', false, false);
 	});
 
-	test('single empty chunk', () => {
-		testModelBuilder(['']);
+	test('t2', () => {
+		testTextBufferFactory('Hello world', '\n', false, false);
 	});
 
-	test('single line in one chunk', () => {
-		testModelBuilder(['Hello world']);
+	test('t3', () => {
+		testTextBufferFactory('Hello world\nHow are you?', '\n', false, false);
 	});
 
-	test('single line in multiple chunks', () => {
-		testModelBuilder(['Hello', ' ', 'world']);
-	});
-
-	test('two lines in single chunk', () => {
-		testModelBuilder(['Hello world\nHow are you?']);
-	});
-
-	test('two lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello worl', 'd\nHow are you?']);
-	});
-
-	test('two lines in multiple chunks 2', () => {
-		testModelBuilder(['Hello worl', 'd', '\n', 'H', 'ow are you?']);
-	});
-
-	test('two lines in multiple chunks 3', () => {
-		testModelBuilder(['Hello worl', 'd', '\nHow are you?']);
-	});
-
-	test('multiple lines in single chunks', () => {
-		testModelBuilder(['Hello world\nHow are you?\nIs everything good today?\nDo you enjoy the weather?']);
-	});
-
-	test('multiple lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello world\nHow are you', '?\nIs everything good today?\nDo you enjoy the weather?']);
-	});
-
-	test('multiple lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello world', '\nHow are you', '?\nIs everything good today?', '\nDo you enjoy the weather?']);
-	});
-
-	test('multiple lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello world\n', 'How are you', '?\nIs everything good today?', '\nDo you enjoy the weather?']);
+	test('t4', () => {
+		testTextBufferFactory('Hello world\nHow are you?\nIs everything good today?\nDo you enjoy the weather?', '\n', false, false);
 	});
 
 	test('carriage return detection (1 \\r\\n 2 \\n)', () => {
-		testModelBuilder(['Hello world\r\n', 'How are you', '?\nIs everything good today?', '\nDo you enjoy the weather?']);
+		testTextBufferFactory('Hello world\r\nHow are you?\nIs everything good today?\nDo you enjoy the weather?', '\n', false, false);
 	});
 
 	test('carriage return detection (2 \\r\\n 1 \\n)', () => {
-		testModelBuilder(['Hello world\r\n', 'How are you', '?\r\nIs everything good today?', '\nDo you enjoy the weather?']);
+		testTextBufferFactory('Hello world\r\nHow are you?\r\nIs everything good today?\nDo you enjoy the weather?', '\r\n', false, false);
 	});
 
 	test('carriage return detection (3 \\r\\n 0 \\n)', () => {
-		testModelBuilder(['Hello world\r\n', 'How are you', '?\r\nIs everything good today?', '\r\nDo you enjoy the weather?']);
-	});
-
-	test('carriage return detection (isolated \\r)', () => {
-		testModelBuilder(['Hello world', '\r', '\n', 'How are you', '?', '\r', '\n', 'Is everything good today?', '\r', '\n', 'Do you enjoy the weather?']);
+		testTextBufferFactory('Hello world\r\nHow are you?\r\nIs everything good today?\r\nDo you enjoy the weather?', '\r\n', false, false);
 	});
 
 	test('BOM handling', () => {
-		testModelBuilder([strings.UTF8_BOM_CHARACTER + 'Hello world!']);
+		testTextBufferFactory(strings.UTF8_BOM_CHARACTER + 'Hello world!', '\n', false, false);
 	});
 
 	test('BOM handling', () => {
-		testModelBuilder([strings.UTF8_BOM_CHARACTER, 'Hello world!']);
-	});
-
-	test('RTL handling 1', () => {
-		testModelBuilder(['Hello world!', 'זוהי עובדה מבוססת שדעתו']);
+		testTextBufferFactory(strings.UTF8_BOM_CHARACTER + 'Hello world!', '\n', false, false);
 	});
 
 	test('RTL handling 2', () => {
-		testModelBuilder(['Hello world!זוהי עובדה מבוססת שדעתו']);
+		testTextBufferFactory('Hello world!זוהי עובדה מבוססת שדעתו', '\n', true, true);
 	});
 
 	test('RTL handling 3', () => {
-		testModelBuilder(['Hello world!זוהי \nעובדה מבוססת שדעתו']);
+		testTextBufferFactory('Hello world!זוהי \nעובדה מבוססת שדעתו', '\n', true, true);
 	});
 
 	test('ASCII handling 1', () => {
-		testModelBuilder(['Hello world!!\nHow do you do?']);
+		testTextBufferFactory('Hello world!!\nHow do you do?', '\n', false, false);
 	});
-	test('ASCII handling 1', () => {
-		testModelBuilder(['Hello world!!\nHow do you do?Züricha📚📚b']);
-	});
-
-	test('issue #32819: some special string cannot be displayed completely', () => {
-		testModelBuilder(['ＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡ123']);
+	test('ASCII handling 2', () => {
+		testTextBufferFactory('Hello world!!\nHow do you do?Züricha📚📚b', '\n', true, false);
 	});
 });
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts
deleted file mode 100644
index 8d7119d2077..00000000000
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { testModelBuilder } from './linesTextBufferBuilder.test';
-import { getRandomInt, getRandomEOLSequence, getRandomString } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
-
-const GENERATE_TESTS = false;
-
-suite('ModelBuilder Auto Tests', () => {
-
-	test('auto1', () => {
-		testModelBuilder(['sarjniow', '\r', '\nbpb', 'ofb', '\njzldgxx', '\r\nkzwfjysng']);
-	});
-
-	test('auto2', () => {
-		testModelBuilder(['i', 'yyernubi\r\niimgn\n', 'ut\r']);
-	});
-
-});
-
-function generateRandomFile(): string {
-	let lineCount = getRandomInt(1, 10);
-	let mixedEOLSequence = getRandomInt(1, 2) === 1 ? true : false;
-	let fixedEOL = getRandomEOLSequence();
-	let lines: string[] = [];
-	for (let i = 0; i < lineCount; i++) {
-		if (i !== 0) {
-			if (mixedEOLSequence) {
-				lines.push(getRandomEOLSequence());
-			} else {
-				lines.push(fixedEOL);
-			}
-		}
-		lines.push(getRandomString(0, 10));
-
-	}
-	return lines.join('');
-}
-
-function generateRandomChunks(file: string): string[] {
-	let result: string[] = [];
-	let cnt = getRandomInt(1, 20);
-
-	let maxOffset = file.length;
-
-	while (cnt > 0 && maxOffset > 0) {
-
-		let offset = getRandomInt(0, maxOffset);
-		result.unshift(file.substring(offset, maxOffset));
-		// let length = getRandomInt(0, maxOffset - offset);
-		// let text = generateFile(true);
-
-		// result.push({
-		// 	offset: offset,
-		// 	length: length,
-		// 	text: text
-		// });
-
-		maxOffset = offset;
-		cnt--;
-	}
-	if (maxOffset !== 0) {
-		result.unshift(file.substring(0, maxOffset));
-	}
-	return result;
-}
-
-function testRandomFile(file: string): boolean {
-	let tests = getRandomInt(5, 10);
-	for (let i = 0; i < tests; i++) {
-		let chunks = generateRandomChunks(file);
-		try {
-			testModelBuilder(chunks);
-		} catch (err) {
-			console.log(err);
-			console.log(JSON.stringify(chunks));
-			return false;
-		}
-	}
-	return true;
-}
-
-if (GENERATE_TESTS) {
-	let number = 1;
-	while (true) {
-		console.log('------BEGIN NEW TEST: ' + number);
-
-		if (!testRandomFile(generateRandomFile())) {
-			break;
-		}
-
-		console.log('------END NEW TEST: ' + (number++));
-	}
-}
diff --git a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
index 42d312d8c7e..ea00cf01d7e 100644
--- a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
+++ b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
@@ -13,10 +13,3 @@ import './electron-browser/toggleMultiCursorModifier';
 import './electron-browser/toggleRenderControlCharacter';
 import './electron-browser/toggleRenderWhitespace';
 import './electron-browser/toggleWordWrap';
-import { OPTIONS, TextBufferType } from 'vs/editor/common/model/textModel';
-
-// Configure text buffer implementation
-if (process.env['VSCODE_PIECE_TREE']) {
-	console.log(`Using TextBufferType.PieceTree (env variable VSCODE_PIECE_TREE)`);
-	OPTIONS.TEXT_BUFFER_IMPLEMENTATION = TextBufferType.PieceTree;
-}

From 73ddb7b7cd59f42071b644c84349f3525066bc24 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 12:11:54 +0200
Subject: [PATCH 141/383] Multi-select picker: Add left/right padding to OK
 button (fixes #46652)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 46158914cf0..ef10d0f6b9c 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -46,7 +46,7 @@
 .quick-input-action {
 	margin-left: 6px;
 	border: 0;
-	padding: 0px 4px 1px 4px;
+	padding: 6px;
 }
 
 .quick-input-action:focus {

From 55be62ffa92e3e6d0b1be3c52ecf7810eae77964 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 12:17:22 +0200
Subject: [PATCH 142/383] Make description optional (fixes #46657)

---
 src/vs/vscode.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 9d3bdf6a800..a60af92a262 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1522,7 +1522,7 @@ declare module 'vscode' {
 		/**
 		 * A human readable string which is rendered less prominent.
 		 */
-		description: string;
+		description?: string;
 
 		/**
 		 * A human readable string which is rendered less prominent.

From 1659e653c3ee41ae8709fd354ca0476357f59019 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 28 Mar 2018 12:00:46 +0200
Subject: [PATCH 143/383] Show error message if data provider is registered for
  unregistered view

---
 .../workbench/api/electron-browser/mainThreadTreeViews.ts  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
index 65b4f04f3ac..828bd6e2e33 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
@@ -31,7 +31,12 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 	$registerTreeViewDataProvider(treeViewId: string): void {
 		const dataProvider = this._register(new TreeViewDataProvider(treeViewId, this._proxy, this.notificationService));
 		this._dataProviders.set(treeViewId, dataProvider);
-		this.viewsService.getTreeViewer(treeViewId).dataProvider = dataProvider;
+		const treeViewer = this.viewsService.getTreeViewer(treeViewId);
+		if (treeViewer) {
+			treeViewer.dataProvider = dataProvider;
+		} else {
+			this.notificationService.error('No view is registered with id: ' + treeViewId);
+		}
 	}
 
 	$reveal(treeViewId: string, item: ITreeItem, parentChain: ITreeItem[], options?: { select?: boolean }): TPromise<void> {

From 0af3876d74d201d878e3b63be00a5fae12e27fbe Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 12:31:23 +0200
Subject: [PATCH 144/383] restore listInactiveFocusBackground for suggest
 widget

---
 src/vs/base/browser/ui/list/listWidget.ts      | 6 ++++++
 src/vs/editor/contrib/suggest/suggestWidget.ts | 1 +
 src/vs/platform/theme/common/styler.ts         | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index e43e322860c..8026e676bdd 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -618,6 +618,11 @@ export class DefaultStyleController implements IStyleController {
 			content.push(`.monaco-list${suffix}:focus .monaco-list-row.selected.focused { color: ${styles.listFocusAndSelectionForeground}; }`);
 		}
 
+		if (styles.listInactiveFocusBackground) {
+			content.push(`.monaco-list${suffix} .monaco-list-row.focused { background-color:  ${styles.listInactiveFocusBackground}; }`);
+			content.push(`.monaco-list${suffix} .monaco-list-row.focused:hover { background-color:  ${styles.listInactiveFocusBackground}; }`); // overwrite :hover style in this case!
+		}
+
 		if (styles.listInactiveSelectionBackground) {
 			content.push(`.monaco-list${suffix} .monaco-list-row.selected { background-color:  ${styles.listInactiveSelectionBackground}; }`);
 			content.push(`.monaco-list${suffix} .monaco-list-row.selected:hover { background-color:  ${styles.listInactiveSelectionBackground}; }`); // overwrite :hover style in this case!
@@ -681,6 +686,7 @@ export interface IListStyles {
 	listFocusAndSelectionForeground?: Color;
 	listInactiveSelectionBackground?: Color;
 	listInactiveSelectionForeground?: Color;
+	listInactiveFocusBackground?: Color;
 	listHoverBackground?: Color;
 	listHoverForeground?: Color;
 	listDropBackground?: Color;
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 2833ee66219..cf433d3dc8a 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -445,6 +445,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		this.toDispose = [
 			attachListStyler(this.list, themeService, {
+				listInactiveFocusBackground: editorSuggestWidgetSelectedBackground,
 				listInactiveFocusOutline: activeContrastBorder
 			}),
 			themeService.onThemeChange(t => this.onThemeChange(t)),
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
index 1b37ca02714..0b2f83624b6 100644
--- a/src/vs/platform/theme/common/styler.ts
+++ b/src/vs/platform/theme/common/styler.ts
@@ -183,6 +183,7 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
 		listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listActiveSelectionForeground,
 		listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || listInactiveSelectionBackground,
 		listInactiveSelectionForeground: (style && style.listInactiveSelectionForeground) || listInactiveSelectionForeground,
+		listInactiveFocusBackground: (style && style.listInactiveFocusBackground),
 		listHoverBackground: (style && style.listHoverBackground) || listHoverBackground,
 		listHoverForeground: (style && style.listHoverForeground) || listHoverForeground,
 		listDropBackground: (style && style.listDropBackground) || listDropBackground,
@@ -201,6 +202,7 @@ export interface IListStyleOverrides extends IStyleOverrides {
 	listFocusAndSelectionForeground?: ColorIdentifier;
 	listInactiveSelectionBackground?: ColorIdentifier;
 	listInactiveSelectionForeground?: ColorIdentifier;
+	listInactiveFocusBackground?: ColorIdentifier;
 	listHoverBackground?: ColorIdentifier;
 	listHoverForeground?: ColorIdentifier;
 	listDropBackground?: ColorIdentifier;

From 8934ecc3f474690201b72a4a00d749cc3aa425eb Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 12:44:26 +0200
Subject: [PATCH 145/383] Tab / Shift+Tab should remain in picker (fixes
 #46661)

---
 .../workbench/browser/parts/quickinput/quickInput.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 34159b6bdc9..93498c50935 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -156,6 +156,18 @@ export class QuickInputService extends Component implements IQuickInputService {
 					dom.EventHelper.stop(e, true);
 					this.close();
 					break;
+				case KeyCode.Tab:
+					if (!event.altKey && !event.ctrlKey && !event.metaKey) {
+						const inputs = this.container.querySelectorAll('input');
+						if (event.shiftKey && event.target === inputs[0]) {
+							dom.EventHelper.stop(e, true);
+							inputs[inputs.length - 1].focus();
+						} else if (!event.shiftKey && event.target === inputs[inputs.length - 1]) {
+							dom.EventHelper.stop(e, true);
+							inputs[0].focus();
+						}
+					}
+					break;
 			}
 		}));
 

From 42c882151f3e001d11f50802e072ac1a5d84dca7 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 28 Mar 2018 12:51:24 +0200
Subject: [PATCH 146/383] only detect git encoding if files.autoGuessEncoding
 is enabled

fixes #46826
---
 extensions/git/src/git.ts        | 8 ++++++--
 extensions/git/src/repository.ts | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 3ce98482707..dc4829808b4 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -660,9 +660,13 @@ export class Repository {
 		return result.stdout;
 	}
 
-	async bufferString(object: string, encoding: string = 'utf8'): Promise<string> {
+	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
 		const stdout = await this.buffer(object);
-		encoding = detectEncoding(stdout) || encoding;
+
+		if (autoGuessEncoding) {
+			encoding = detectEncoding(stdout) || encoding;
+		}
+
 		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
 
 		return iconv.decode(stdout, encoding);
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 3aa3ac57275..cca9f563060 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -815,7 +815,9 @@ export class Repository implements Disposable {
 			const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
 			const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
 			const defaultEncoding = configFiles.get<string>('encoding');
-			return this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding);
+			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
+
+			return this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding, autoGuessEncoding);
 		});
 	}
 

From 3114b0ca670b7366206f0fea0b8f056528c7b532 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 12:54:42 +0200
Subject: [PATCH 147/383] Fixes #46342: Have model.applyEdits maintain order
 for inverse edits

---
 .../model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts  |  8 +++++++-
 .../test/common/model/editableTextModelTestUtils.ts   | 11 ++++++++++-
 src/vs/editor/test/common/model/model.test.ts         | 10 ++++++++++
 .../test/common/model/modelEditOperation.test.ts      | 11 ++++++++++-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index 20f2c79bfa5..27416907f49 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -23,6 +23,10 @@ export interface IValidatedEditOperation {
 	isAutoWhitespaceEdit: boolean;
 }
 
+export interface IReverseSingleEditOperation extends IIdentifiedSingleEditOperation {
+	sortIndex: number;
+}
+
 export class PieceTreeTextBuffer implements ITextBuffer {
 	private _pieceTree: PieceTreeBase;
 	private _BOM: string;
@@ -239,18 +243,20 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 			}
 		}
 
-		let reverseOperations: IIdentifiedSingleEditOperation[] = [];
+		let reverseOperations: IReverseSingleEditOperation[] = [];
 		for (let i = 0; i < operations.length; i++) {
 			let op = operations[i];
 			let reverseRange = reverseRanges[i];
 
 			reverseOperations[i] = {
+				sortIndex: op.sortIndex,
 				identifier: op.identifier,
 				range: reverseRange,
 				text: this.getValueInRange(op.range),
 				forceMoveMarkers: op.forceMoveMarkers
 			};
 		}
+		reverseOperations.sort((a, b) => a.sortIndex - b.sortIndex);
 
 		this._mightContainRTL = mightContainRTL;
 		this._mightContainNonBasicASCII = mightContainNonBasicASCII;
diff --git a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
index 7f1fc466033..035ec1a9221 100644
--- a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
+++ b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
@@ -31,8 +31,17 @@ export function testApplyEditsWithSyncedModels(original: string[], edits: IIdent
 		assert.deepEqual(model.getValue(EndOfLinePreference.LF), originalStr);
 
 		if (!inputEditsAreInvalid) {
+			const simplifyEdit = (edit: IIdentifiedSingleEditOperation) => {
+				return {
+					identifier: edit.identifier,
+					range: edit.range,
+					text: edit.text,
+					forceMoveMarkers: edit.forceMoveMarkers,
+					isAutoWhitespaceEdit: edit.isAutoWhitespaceEdit
+				};
+			};
 			// Assert the inverse of the inverse edits are the original edits
-			assert.deepEqual(inverseInverseEdits, edits);
+			assert.deepEqual(inverseInverseEdits.map(simplifyEdit), edits.map(simplifyEdit));
 		}
 
 		assertMirrorModels();
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index 0c15f9753f5..63b862035ec 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -328,6 +328,16 @@ suite('Editor Model - Model', () => {
 			false
 		));
 	});
+
+	test('issue #46342: Maintain edit operation order in applyEdits', () => {
+		let res = thisModel.applyEdits([
+			{ range: new Range(2, 1, 2, 1), text: 'a' },
+			{ range: new Range(1, 1, 1, 1), text: 'b' },
+		]);
+
+		assert.deepEqual(res[0].range, new Range(2, 1, 2, 2));
+		assert.deepEqual(res[1].range, new Range(1, 1, 1, 2));
+	});
 });
 
 
diff --git a/src/vs/editor/test/common/model/modelEditOperation.test.ts b/src/vs/editor/test/common/model/modelEditOperation.test.ts
index ac20a1b71d5..e249ec82363 100644
--- a/src/vs/editor/test/common/model/modelEditOperation.test.ts
+++ b/src/vs/editor/test/common/model/modelEditOperation.test.ts
@@ -68,7 +68,16 @@ suite('Editor Model - Model Edit Operation', () => {
 		assert.equal(model.getLineContent(4), LINE4);
 		assert.equal(model.getLineContent(5), LINE5);
 
-		assert.deepEqual(originalOp, editOp);
+		const simplifyEdit = (edit: IIdentifiedSingleEditOperation) => {
+			return {
+				identifier: edit.identifier,
+				range: edit.range,
+				text: edit.text,
+				forceMoveMarkers: edit.forceMoveMarkers,
+				isAutoWhitespaceEdit: edit.isAutoWhitespaceEdit
+			};
+		};
+		assert.deepEqual(originalOp.map(simplifyEdit), editOp.map(simplifyEdit));
 	}
 
 	test('Insert inline', () => {

From 95eb2f6d2e7cbf1cfe8f9af38560802d8e6943bb Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 28 Mar 2018 12:55:28 +0200
Subject: [PATCH 148/383] update inno updater

fixes #45607
---
 build/win32/OSSREADME.json   | 596 +++++++++++++++++------------------
 build/win32/inno_updater.exe | Bin 395264 -> 395264 bytes
 2 files changed, 298 insertions(+), 298 deletions(-)

diff --git a/build/win32/OSSREADME.json b/build/win32/OSSREADME.json
index cbcef582e54..10f47d06684 100755
--- a/build/win32/OSSREADME.json
+++ b/build/win32/OSSREADME.json
@@ -1,10 +1,10 @@
 [
 	{
-		"name": "rust-lang-nursery/lazy-static.rs",
-		"version": "1.0.0",
-		"repositoryUrl": "https://github.com/rust-lang-nursery/lazy-static.rs",
+		"name": "rust-lang/libc",
+		"version": "0.2.36",
+		"repositoryUrl": "https://github.com/rust-lang/libc",
 		"licenseDetail": [
-			"Copyright (c) 2010 The Rust Project Developers",
+			"Copyright (c) 2014 The Rust Project Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any",
 			"person obtaining a copy of this software and associated",
@@ -32,6 +32,33 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.4.0",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
 	{
 		"name": "rust-num/num",
 		"version": "0.1.41",
@@ -65,6 +92,35 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "BurntSushi/byteorder",
+		"version": "1.2.1",
+		"repositoryUrl": "https://github.com/BurntSushi/byteorder",
+		"licenseDetail": [
+			"The MIT License (MIT)",
+			"",
+			"Copyright (c) 2015 Andrew Gallant",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in",
+			"all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN",
+			"THE SOFTWARE."
+		],
+		"isProd": true
+	},
 	{
 		"name": "dtolnay/isatty",
 		"version": "0.1.6",
@@ -98,6 +154,72 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "rust-lang-nursery/lazy-static.rs",
+		"version": "1.0.0",
+		"repositoryUrl": "https://github.com/rust-lang-nursery/lazy-static.rs",
+		"licenseDetail": [
+			"Copyright (c) 2010 The Rust Project Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-num/num-integer",
+		"version": "0.1.35",
+		"repositoryUrl": "https://github.com/rust-num/num-integer",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		],
+		"isProd": true
+	},
 	{
 		"name": "retep998/winapi-rs",
 		"version": "0.2.2",
@@ -126,100 +248,9 @@
 		"isProd": true
 	},
 	{
-		"name": "BurntSushi/byteorder",
-		"version": "1.2.1",
-		"repositoryUrl": "https://github.com/BurntSushi/byteorder",
-		"licenseDetail": [
-			"The MIT License (MIT)",
-			"",
-			"Copyright (c) 2015 Andrew Gallant",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in",
-			"all copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN",
-			"THE SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-num/num-integer",
-		"version": "0.1.35",
-		"repositoryUrl": "https://github.com/rust-num/num-integer",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
-			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "mrhooray/crc-rs",
-		"version": "1.7.0",
-		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
-		"licenseDetail": [
-			"MIT License",
-			"",
-			"Copyright (c) 2017 crc-rs Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-lang/libc",
-		"version": "0.2.36",
-		"repositoryUrl": "https://github.com/rust-lang/libc",
+		"name": "rust-num/num-iter",
+		"version": "0.1.34",
+		"repositoryUrl": "https://github.com/rust-num/num-iter",
 		"licenseDetail": [
 			"Copyright (c) 2014 The Rust Project Developers",
 			"",
@@ -283,9 +314,9 @@
 		"isProd": true
 	},
 	{
-		"name": "rust-num/num-iter",
-		"version": "0.1.34",
-		"repositoryUrl": "https://github.com/rust-num/num-iter",
+		"name": "slog-rs/slog",
+		"version": "2.1.1",
+		"repositoryUrl": "https://github.com/slog-rs/slog",
 		"licenseDetail": [
 			"Copyright (c) 2014 The Rust Project Developers",
 			"",
@@ -316,35 +347,60 @@
 		"isProd": true
 	},
 	{
-		"name": "slog-rs/slog",
-		"version": "2.1.1",
-		"repositoryUrl": "https://github.com/slog-rs/slog",
+		"name": "Sgeo/take_mut",
+		"version": "0.2.0",
+		"repositoryUrl": "https://github.com/Sgeo/take_mut",
 		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
+			"The MIT License (MIT)",
 			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
+			"Copyright (c) 2016 Sgeo",
 			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
 			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "redox-os/termios",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/redox-os/termios",
+		"licenseDetail": [
+			"MIT License",
+			"",
+			"Copyright (c) 2017 Redox OS",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
 		],
 		"isProd": true
 	},
@@ -379,75 +435,13 @@
 		"isProd": true
 	},
 	{
-		"name": "Stebalien/term",
-		"version": "0.4.6",
-		"repositoryUrl": "https://github.com/Stebalien/term",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
-			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "redox-os/termios",
-		"version": "0.1.1",
-		"repositoryUrl": "https://github.com/redox-os/termios",
+		"name": "mrhooray/crc-rs",
+		"version": "1.7.0",
+		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
 		"licenseDetail": [
 			"MIT License",
 			"",
-			"Copyright (c) 2017 Redox OS",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "Sgeo/take_mut",
-		"version": "0.2.0",
-		"repositoryUrl": "https://github.com/Sgeo/take_mut",
-		"licenseDetail": [
-			"The MIT License (MIT)",
-			"",
-			"Copyright (c) 2016 Sgeo",
+			"Copyright (c) 2017 crc-rs Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any person obtaining a copy",
 			"of this software and associated documentation files (the \"Software\"), to deal",
@@ -560,39 +554,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "rust-lang/time",
-		"version": "0.1.39",
-		"repositoryUrl": "https://github.com/rust-lang/time",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
-			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "chronotope/chrono",
 		"version": "0.4.0",
@@ -868,29 +829,35 @@
 		"isProd": true
 	},
 	{
-		"name": "retep998/winapi-rs",
-		"version": "0.1.1",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"name": "rust-lang/time",
+		"version": "0.1.39",
+		"repositoryUrl": "https://github.com/rust-lang/time",
 		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
+			"Copyright (c) 2014 The Rust Project Developers",
 			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
 			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
 			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
 		],
 		"isProd": true
 	},
@@ -948,33 +915,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.4.0",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "retep998/winapi-rs",
 		"version": "0.3.4",
@@ -1002,33 +942,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.4.0",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "slog-rs/async",
 		"version": "2.2.0",
@@ -1790,5 +1703,92 @@
 			"  defined by the Mozilla Public License, v. 2.0."
 		],
 		"isProd": true
+	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.4.0",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "Stebalien/term",
+		"version": "0.4.6",
+		"repositoryUrl": "https://github.com/Stebalien/term",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		],
+		"isProd": true
 	}
 ]
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index c216c4043324f683e3155ab9d699768e1d0054b7..b69182a7e911c0f18ffa16731fa844a8304bfa06 100755
GIT binary patch
delta 126728
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

delta 125949
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
B*7E=W


From 1323851bd589dfebe266ede8844b810a4b9c28e2 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 12:56:34 +0200
Subject: [PATCH 149/383] fix blast from the past

---
 src/vs/platform/files/common/files.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index c9d7d12260d..a6d2eac1d88 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -493,9 +493,10 @@ export interface IResolveContentOptions {
 	acceptTextOnly?: boolean;
 
 	/**
-	 * The optional etag parameter allows to return a 304 (Not Modified) if the etag matches
-	 * with the remote resource. It is the task of the caller to makes sure to handle this
-	 * error case from the promise.
+	 * The optional etag parameter allows to return early from resolving the resource if
+	 * the contents on disk match the etag. This prevents accumulated reading of resources
+	 * that have been read already with the same etag.
+	 * It is the task of the caller to makes sure to handle this error case from the promise.
 	 */
 	etag?: string;
 

From 2d2741477b957931a4accb0568f791cbd6dbcb8d Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Wed, 28 Mar 2018 14:25:39 +0200
Subject: [PATCH 150/383] Fix newline issue on i18n import

---
 build/lib/i18n.js | 5 ++++-
 build/lib/i18n.ts | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index 31282b6c5bb..eb87269c1d1 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -1046,7 +1046,10 @@ function createI18nFile(originalFilePath, messages) {
         var key = _a[_i];
         result[key] = messages[key];
     }
-    var content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n');
+    var content = JSON.stringify(result, null, '\t');
+    if (process.platform === 'win32') {
+        content = content.replace(/\n/g, '/r/n');
+    }
     return new File({
         path: path.join(originalFilePath + '.i18n.json'),
         contents: Buffer.from(content, 'utf8')
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 7c5899ac953..883b1059c19 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -1171,7 +1171,10 @@ function createI18nFile(originalFilePath: string, messages: any): File {
 		result[key] = messages[key];
 	}
 
-	let content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n');
+	let content = JSON.stringify(result, null, '\t');
+	if (process.platform === 'win32') {
+		content = content.replace(/\n/g, '/r/n');
+	}
 	return new File({
 		path: path.join(originalFilePath + '.i18n.json'),
 		contents: Buffer.from(content, 'utf8')

From dfec7a47895cce5905fb03e3dfc3cf7a3123923e Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Wed, 28 Mar 2018 14:30:27 +0200
Subject: [PATCH 151/383] Using correct newline

---
 build/lib/i18n.js | 2 +-
 build/lib/i18n.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index eb87269c1d1..6f5558001c4 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -1048,7 +1048,7 @@ function createI18nFile(originalFilePath, messages) {
     }
     var content = JSON.stringify(result, null, '\t');
     if (process.platform === 'win32') {
-        content = content.replace(/\n/g, '/r/n');
+        content = content.replace(/\n/g, '\r\n');
     }
     return new File({
         path: path.join(originalFilePath + '.i18n.json'),
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 883b1059c19..06b51be8767 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -1173,7 +1173,7 @@ function createI18nFile(originalFilePath: string, messages: any): File {
 
 	let content = JSON.stringify(result, null, '\t');
 	if (process.platform === 'win32') {
-		content = content.replace(/\n/g, '/r/n');
+		content = content.replace(/\n/g, '\r\n');
 	}
 	return new File({
 		path: path.join(originalFilePath + '.i18n.json'),

From 4b95443bffede89a4fa90418b79339ab6aac416c Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 15:01:49 +0200
Subject: [PATCH 152/383] Fire only once per item (fixes #46669 and #46671)

---
 src/vs/base/common/event.ts                         |  5 +++++
 .../browser/parts/quickinput/quickInput.ts          | 13 ++++++++-----
 .../parts/quickinput/quickInputCheckboxList.ts      |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 53a3ce824a1..2ac42d2fa4e 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -365,6 +365,7 @@ export interface IChainableEvent<T> {
 	map<O>(fn: (i: T) => O): IChainableEvent<O>;
 	forEach(fn: (i: T) => void): IChainableEvent<T>;
 	filter(fn: (e: T) => boolean): IChainableEvent<T>;
+	latch(): IChainableEvent<T>;
 	on(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable;
 }
 
@@ -398,6 +399,10 @@ class ChainableEvent<T> implements IChainableEvent<T> {
 		return new ChainableEvent(filterEvent(this._event, fn));
 	}
 
+	latch(): IChainableEvent<T> {
+		return new ChainableEvent(latch(this._event));
+	}
+
 	on(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[]) {
 		return this._event(listener, thisArgs, disposables);
 	}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 93498c50935..d9fd0bf8c41 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -29,6 +29,7 @@ import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { attachBadgeStyler, attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
+import { chain } from 'vs/base/common/event';
 
 const $ = dom.$;
 
@@ -127,11 +128,13 @@ export class QuickInputService extends Component implements IQuickInputService {
 				this.inputBox.setFocus();
 			}, 0);
 		}));
-		this.toUnbind.push(this.checkboxList.onFocusChange(e => {
-			if (this.progress && e.length) {
-				this.progress(e[0]);
-			}
-		}));
+		this.toUnbind.push(
+			chain(this.checkboxList.onFocusChange)
+				.map(e => e[0])
+				.filter(e => !!e)
+				.latch()
+				.on(e => this.progress && this.progress(e))
+		);
 
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
 			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index a4328d29cf0..89b1e171902 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -21,6 +21,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { memoize } from 'vs/base/common/decorators';
 
 const $ = dom.$;
 
@@ -181,6 +182,7 @@ export class QuickInputCheckboxList {
 		}));
 	}
 
+	@memoize
 	get onFocusChange() {
 		return mapEvent(this.list.onFocusChange, e => e.elements.map(e => e.item));
 	}

From 4da5d23e0a0232f16186b82a5bdc14072cd8c78b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 15:02:07 +0200
Subject: [PATCH 153/383] No scrolling on editor tabs when enabling them (fixes
 #46845)

---
 .../browser/parts/editor/editorGroupsControl.ts     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
index 87fea4fca7f..f647428e7f9 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -288,6 +288,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 					titleControl.dispose();
 					titleContainer.empty();
 					this.createTitleControl(this.stacks.groupAt(position), this.silos[position], titleContainer, this.getInstantiationService(position));
+					this.layoutTitleControl(position);
 				}
 
 				// Refresh title when layout options change
@@ -2166,16 +2167,18 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		});
 
 		// Layout title controls
-		POSITIONS.forEach(position => {
-			const siloWidth = this.layoutVertically ? this.silosSize[position] : this.dimension.width;
-
-			this.getTitleAreaControl(position).layout(new Dimension(siloWidth, EditorGroupsControl.EDITOR_TITLE_HEIGHT));
-		});
+		POSITIONS.forEach(position => this.layoutTitleControl(position));
 
 		// Update minimized state
 		this.updateMinimizedState();
 	}
 
+	private layoutTitleControl(position: Position): void {
+		const siloWidth = this.layoutVertically ? this.silosSize[position] : this.dimension.width;
+
+		this.getTitleAreaControl(position).layout(new Dimension(siloWidth, EditorGroupsControl.EDITOR_TITLE_HEIGHT));
+	}
+
 	private layoutEditor(position: Position): void {
 		const editorSize = this.silosSize[position];
 		const editor = this.visibleEditors[position];

From 38834320e3c98da3dc124017d661c3dcd09f6fec Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 28 Mar 2018 15:09:14 +0200
Subject: [PATCH 154/383] fixes #45208

---
 .../extensions/common/extensionsRegistry.ts   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index 2ec528fcec0..cabacc9d019 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -125,7 +125,7 @@ const schema: IJSONSchema = {
 	properties: {
 		engines: {
 			type: 'object',
-
+			description: nls.localize('vscode.extension.engines', "Engine compatibility."),
 			properties: {
 				'vscode': {
 					type: 'string',
@@ -249,6 +249,25 @@ const schema: IJSONSchema = {
 				}
 			}
 		},
+		markdown: {
+			type: 'string',
+			description: nls.localize('vscode.extension.markdown', "Controls the Markdown rendering engine used in the Marketplace. Either github (default) or standard."),
+			enum: ['github', 'standard'],
+			default: 'github'
+		},
+		qna: {
+			default: 'marketplace',
+			description: nls.localize('vscode.extension.qna', "Controls the Q&A link in the Marketplace. Set to marketplace to enable the default Marketplace Q & A site. Set to a string to provide the URL of a custom Q & A site. Set to false to disable Q & A altogether."),
+			anyOf: [
+				{
+					type: ['string', 'boolean'],
+					enum: ['marketplace', false]
+				},
+				{
+					type: 'string'
+				}
+			]
+		},
 		extensionDependencies: {
 			description: nls.localize('vscode.extension.extensionDependencies', 'Dependencies to other extensions. The identifier of an extension is always ${publisher}.${name}. For example: vscode.csharp.'),
 			type: 'array',

From 4e7a6812aeb6828610d94388c446c908814f85d8 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Wed, 28 Mar 2018 15:23:34 +0200
Subject: [PATCH 155/383] Fixes #46764: Missing quoting in tasks.json makes all
 other tasks disappear

---
 src/vs/workbench/parts/tasks/common/tasks.ts                   | 3 +++
 src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts
index 1528f762003..2dc2a15bbac 100644
--- a/src/vs/workbench/parts/tasks/common/tasks.ts
+++ b/src/vs/workbench/parts/tasks/common/tasks.ts
@@ -34,6 +34,9 @@ export enum ShellQuoting {
 
 export namespace ShellQuoting {
 	export function from(this: void, value: string): ShellQuoting {
+		if (!value) {
+			return ShellQuoting.Strong;
+		}
 		switch (value.toLowerCase()) {
 			case 'escape':
 				return ShellQuoting.Escape;
diff --git a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
index 8c340e0a9f8..191204144ef 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
@@ -156,6 +156,7 @@ const command: IJSONSchema = {
 		},
 		{
 			type: 'object',
+			required: ['value', 'quoting'],
 			properties: {
 				value: {
 					type: 'string',
@@ -188,6 +189,7 @@ const args: IJSONSchema = {
 			},
 			{
 				type: 'object',
+				required: ['value', 'quoting'],
 				properties: {
 					value: {
 						type: 'string',

From 3339869362625823f0d1e65332dd4cece85b1e5f Mon Sep 17 00:00:00 2001
From: Christian Oliff <christianoliff@yahoo.com>
Date: Wed, 28 Mar 2018 22:27:27 +0900
Subject: [PATCH 156/383] HTTPS link

---
 .vscode/extensions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 6cb9439d5c7..8ad783bcbe3 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,9 +1,9 @@
 {
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"eg2.tslint",
 		"dbaeumer.vscode-eslint",
 		"msjsdiag.debugger-for-chrome"
 	]
-}
\ No newline at end of file
+}

From e72d8d15b40f00d4a3751ee333806c94de7237bb Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 15:33:56 +0200
Subject: [PATCH 157/383] Fixes #46314: Make sure model change events reach the
 view models first

---
 src/vs/editor/common/model.ts                 |  7 ++++
 src/vs/editor/common/model/textModel.ts       | 22 ++++++++----
 .../editor/common/viewModel/viewModelImpl.ts  |  2 +-
 .../test/browser/controller/cursor.test.ts    | 34 ++++++++++++++++++-
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index a4b31bd392e..2f2a7433d4b 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -1002,6 +1002,13 @@ export interface ITextModel {
 	 */
 	redo(): Selection[];
 
+	/**
+	 * @deprecated Please use `onDidChangeContent` instead.
+	 * An event emitted when the contents of the model have changed.
+	 * @internal
+	 * @event
+	 */
+	onDidChangeRawContentFast(listener: (e: ModelRawContentChangedEvent) => void): IDisposable;
 	/**
 	 * @deprecated Please use `onDidChangeContent` instead.
 	 * An event emitted when the contents of the model have changed.
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 2fd6a637aa7..ac9a6b5e49b 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -211,11 +211,14 @@ export class TextModel extends Disposable implements model.ITextModel {
 	public readonly onDidChangeOptions: Event<IModelOptionsChangedEvent> = this._onDidChangeOptions.event;
 
 	private readonly _eventEmitter: DidChangeContentEmitter = this._register(new DidChangeContentEmitter());
+	public onDidChangeRawContentFast(listener: (e: ModelRawContentChangedEvent) => void): IDisposable {
+		return this._eventEmitter.fastEvent((e: InternalModelContentChangeEvent) => listener(e.rawContentChangedEvent));
+	}
 	public onDidChangeRawContent(listener: (e: ModelRawContentChangedEvent) => void): IDisposable {
-		return this._eventEmitter.event((e: InternalModelContentChangeEvent) => listener(e.rawContentChangedEvent));
+		return this._eventEmitter.slowEvent((e: InternalModelContentChangeEvent) => listener(e.rawContentChangedEvent));
 	}
 	public onDidChangeContent(listener: (e: IModelContentChangedEvent) => void): IDisposable {
-		return this._eventEmitter.event((e: InternalModelContentChangeEvent) => listener(e.contentChangedEvent));
+		return this._eventEmitter.slowEvent((e: InternalModelContentChangeEvent) => listener(e.contentChangedEvent));
 	}
 	//#endregion
 
@@ -2600,8 +2603,13 @@ export class DidChangeDecorationsEmitter extends Disposable {
 
 export class DidChangeContentEmitter extends Disposable {
 
-	private readonly _actual: Emitter<InternalModelContentChangeEvent> = this._register(new Emitter<InternalModelContentChangeEvent>());
-	public readonly event: Event<InternalModelContentChangeEvent> = this._actual.event;
+	/**
+	 * Both `fastEvent` and `slowEvent` work the same way and contain the same events, but first we invoke `fastEvent` and then `slowEvent`.
+	 */
+	private readonly _fastEmitter: Emitter<InternalModelContentChangeEvent> = this._register(new Emitter<InternalModelContentChangeEvent>());
+	public readonly fastEvent: Event<InternalModelContentChangeEvent> = this._fastEmitter.event;
+	private readonly _slowEmitter: Emitter<InternalModelContentChangeEvent> = this._register(new Emitter<InternalModelContentChangeEvent>());
+	public readonly slowEvent: Event<InternalModelContentChangeEvent> = this._slowEmitter.event;
 
 	private _deferredCnt: number;
 	private _deferredEvent: InternalModelContentChangeEvent;
@@ -2622,7 +2630,8 @@ export class DidChangeContentEmitter extends Disposable {
 			if (this._deferredEvent !== null) {
 				const e = this._deferredEvent;
 				this._deferredEvent = null;
-				this._actual.fire(e);
+				this._fastEmitter.fire(e);
+				this._slowEmitter.fire(e);
 			}
 		}
 	}
@@ -2636,6 +2645,7 @@ export class DidChangeContentEmitter extends Disposable {
 			}
 			return;
 		}
-		this._actual.fire(e);
+		this._fastEmitter.fire(e);
+		this._slowEmitter.fire(e);
 	}
 }
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index cdde76ac955..6f9f27e704e 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -173,7 +173,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 
 	private _registerModelEvents(): void {
 
-		this._register(this.model.onDidChangeRawContent((e) => {
+		this._register(this.model.onDidChangeRawContentFast((e) => {
 			try {
 				const eventsCollector = this._beginEmit();
 
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 296051b8ef3..f6562068e8a 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -17,11 +17,14 @@ import { IndentAction, IndentationRule } from 'vs/editor/common/modes/languageCo
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
 import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
-import { LanguageIdentifier } from 'vs/editor/common/modes';
+import { LanguageIdentifier, ITokenizationSupport, IState, TokenizationRegistry } from 'vs/editor/common/modes';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { CoreNavigationCommands, CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
+import { NULL_STATE } from 'vs/editor/common/modes/nullMode';
+import { TokenizationResult2 } from 'vs/editor/common/core/token';
+
 let H = Handler;
 
 // --------- utils
@@ -2048,6 +2051,35 @@ suite('Editor Controller - Regression tests', () => {
 
 		model.dispose();
 	});
+
+	test('issue #46314: ViewModel is out of sync with Model!', () => {
+
+		const tokenizationSupport: ITokenizationSupport = {
+			getInitialState: () => NULL_STATE,
+			tokenize: undefined,
+			tokenize2: (line: string, state: IState): TokenizationResult2 => {
+				return new TokenizationResult2(null, state);
+			}
+		};
+
+		const LANGUAGE_ID = 'modelModeTest1';
+		const languageRegistration = TokenizationRegistry.register(LANGUAGE_ID, tokenizationSupport);
+		let model = TextModel.createFromString('Just text', undefined, new LanguageIdentifier(LANGUAGE_ID, 0));
+
+		withTestCodeEditor(null, { model: model }, (editor1, cursor1) => {
+			withTestCodeEditor(null, { model: model }, (editor2, cursor2) => {
+
+				editor1.onDidChangeCursorPosition(() => {
+					model.tokenizeIfCheap(1);
+				});
+
+				model.applyEdits([{ range: new Range(1, 1, 1, 1), text: '-' }]);
+			});
+		});
+
+		languageRegistration.dispose();
+		model.dispose();
+	});
 });
 
 suite('Editor Controller - Cursor Configuration', () => {

From cc81646edfee5cd53fc082d73b43cc1c34db612c Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 28 Mar 2018 15:12:16 +0200
Subject: [PATCH 158/383] Rename editorActiveLineNumber.foreground. Fixes
 #46848

---
 extensions/theme-abyss/themes/abyss-color-theme.json |  2 +-
 .../themes/kimbie-dark-color-theme.json              |  2 +-
 .../themes/dimmed-monokai-color-theme.json           |  2 +-
 .../theme-monokai/themes/monokai-color-theme.json    |  2 +-
 .../themes/quietlight-color-theme.json               |  2 +-
 extensions/theme-red/themes/Red-color-theme.json     |  2 +-
 .../themes/solarized-dark-color-theme.json           |  2 +-
 .../themes/solarized-light-color-theme.json          |  2 +-
 .../themes/tomorrow-night-blue-theme.json            |  2 +-
 src/vs/editor/common/view/editorColorRegistry.ts     |  5 ++++-
 src/vs/platform/theme/common/colorRegistry.ts        | 12 ++++++++----
 11 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json
index 25d88261148..3c29932bdee 100644
--- a/extensions/theme-abyss/themes/abyss-color-theme.json
+++ b/extensions/theme-abyss/themes/abyss-color-theme.json
@@ -312,7 +312,7 @@
 		"editorHoverWidget.background": "#000c38",
 		"editorHoverWidget.border": "#004c18",
 		"editorLineNumber.foreground": "#406385",
-		"editorActiveLineNumber.foreground": "#80a2c2",
+		"editorLineNumber.activeForeground": "#80a2c2",
 		"editorMarkerNavigation.background": "#060621",
 		"editorMarkerNavigationError.background": "#AB395B",
 		"editorMarkerNavigationWarning.background": "#5B7E7A",
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index d9c98d09157..ebcf0341dc8 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -20,7 +20,7 @@
 		"editorHoverWidget.background": "#221a14",
 		"editorGroupHeader.tabsBackground": "#131510",
 		"editorGroup.background": "#0f0c08",
-		"editorActiveLineNumber.foreground": "#adadad",
+		"editorLineNumber.activeForeground": "#adadad",
 		"tab.inactiveBackground": "#131510",
 		"titleBar.activeBackground": "#423523",
 		"statusBar.background": "#423523",
diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
index 1ac4adbc7f4..0a45c9ffe88 100644
--- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
+++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
@@ -13,7 +13,7 @@
 		"editor.selectionBackground": "#676b7180",
 		"editor.selectionHighlightBackground": "#575b6180",
 		"editor.lineHighlightBackground": "#303030",
-		"editorActiveLineNumber.foreground": "#949494",
+		"editorLineNumber.activeForeground": "#949494",
 		"editor.wordHighlightBackground": "#4747a180",
         "editor.wordHighlightStrongBackground": "#6767ce80",
 		"editorCursor.foreground": "#c07020",
diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json
index d0c7c7e8437..610bf0dc5a2 100644
--- a/extensions/theme-monokai/themes/monokai-color-theme.json
+++ b/extensions/theme-monokai/themes/monokai-color-theme.json
@@ -24,7 +24,7 @@
         "editor.wordHighlightBackground": "#4a4a7680",
         "editor.wordHighlightStrongBackground": "#6a6a9680",
 		"editor.lineHighlightBackground": "#3e3d32",
-		"editorActiveLineNumber.foreground": "#c2c2bf",
+		"editorLineNumber.activeForeground": "#c2c2bf",
 		"editorCursor.foreground": "#f8f8f0",
 		"editorWhitespace.foreground": "#464741",
 		"editorIndentGuide.background": "#464741",
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
index 9a947168714..3e1ad56f8ad 100644
--- a/extensions/theme-quietlight/themes/quietlight-color-theme.json
+++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -494,7 +494,7 @@
 		"editor.background": "#F5F5F5",
 		"editorWhitespace.foreground": "#AAAAAA",
 		"editor.lineHighlightBackground": "#E4F6D4",
-		"editorActiveLineNumber.foreground": "#9769dc",
+		"editorLineNumber.activeForeground": "#9769dc",
 		"editor.selectionBackground": "#C9D0D9",
 		"panel.background": "#F5F5F5",
 		"sideBar.background": "#F2F2F2",
diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json
index 43eaa9b6414..8d69156514c 100644
--- a/extensions/theme-red/themes/Red-color-theme.json
+++ b/extensions/theme-red/themes/Red-color-theme.json
@@ -21,7 +21,7 @@
 		"editorWhitespace.foreground": "#c10000",
 		"editor.selectionBackground": "#750000",
 		"editorLineNumber.foreground": "#ff777788",
-		"editorActiveLineNumber.foreground": "#ffbbbb88",
+		"editorLineNumber.activeForeground": "#ffbbbb88",
 		"editorWidget.background": "#300000",
 		"editorHoverWidget.background": "#300000",
 		"editorSuggestWidget.background": "#300000",
diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
index e0c5df0f187..2f5db67fbad 100644
--- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
+++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
@@ -355,7 +355,7 @@
 		"editorCursor.foreground": "#D30102",
 		"editorWhitespace.foreground": "#93A1A180",
 		"editor.lineHighlightBackground": "#073642",
-		"editorActiveLineNumber.foreground": "#949494",
+		"editorLineNumber.activeForeground": "#949494",
 		"editor.selectionBackground": "#073642",
 		// "editorIndentGuide.background": "",
 		"editorHoverWidget.background": "#004052",
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
index 0d5b202ea12..d752a613c38 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -354,7 +354,7 @@
 		"editor.selectionBackground": "#EEE8D5",
 		// "editorIndentGuide.background": "",
 		"editorHoverWidget.background": "#CCC4B0",
-		"editorActiveLineNumber.foreground": "#567983",
+		"editorLineNumber.activeForeground": "#567983",
 		// "editorHoverWidget.border": "",
 		// "editorLineNumber.foreground": "",
 		// "editorMarkerNavigation.background": "",
diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
index 0b89e5b9e6c..de15bf88bc8 100644
--- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
+++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
@@ -15,7 +15,7 @@
 		"editor.foreground": "#ffffff",
 		"editor.selectionBackground": "#003f8e",
         "editor.lineHighlightBackground": "#00346e",
-        "editorActiveLineNumber.foreground": "#949494",
+        "editorLineNumber.activeForeground": "#949494",
 		"editorCursor.foreground": "#ffffff",
 		"editorWhitespace.foreground": "#404f7d",
 		"editorWidget.background": "#001c40",
diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts
index e92db6d8195..86cfc23d51a 100644
--- a/src/vs/editor/common/view/editorColorRegistry.ts
+++ b/src/vs/editor/common/view/editorColorRegistry.ts
@@ -21,7 +21,10 @@ export const editorCursorBackground = registerColor('editorCursor.background', n
 export const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.'));
 export const editorIndentGuides = registerColor('editorIndentGuide.background', { dark: editorWhitespaces, light: editorWhitespaces, hc: editorWhitespaces }, nls.localize('editorIndentGuides', 'Color of the editor indentation guides.'));
 export const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#5A5A5A', light: '#2B91AF', hc: Color.white }, nls.localize('editorLineNumbers', 'Color of editor line numbers.'));
-export const editorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: null, light: null, hc: null }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
+
+const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: null, light: null, hc: null }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'), false, nls.localize('deprecatedEditorActiveLineNumber', 'Id is deprecated. Use \'editorLineNumber.activeForeground\' instead.'));
+export const editorActiveLineNumber = registerColor('editorLineNumber.activeForeground', { dark: deprecatedEditorActiveLineNumber, light: deprecatedEditorActiveLineNumber, hc: deprecatedEditorActiveLineNumber }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
+
 export const editorRuler = registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hc: Color.white }, nls.localize('editorRuler', 'Color of the editor rulers.'));
 
 export const editorCodeLensForeground = registerColor('editorCodeLens.foreground', { dark: '#999999', light: '#999999', hc: '#999999' }, nls.localize('editorCodeLensForeground', 'Foreground color of editor code lenses'));
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 7a283de5e34..66aad012e30 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -86,10 +86,14 @@ class ColorRegistry implements IColorRegistry {
 		this.colorsById = {};
 	}
 
-	public registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency = false): ColorIdentifier {
+	public registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency = false, deprecationMessage?: string): ColorIdentifier {
 		let colorContribution = { id, description, defaults, needsTransparency };
 		this.colorsById[id] = colorContribution;
-		this.colorSchema.properties[id] = { type: 'string', description, format: 'color-hex', default: '#ff0000' };
+		let propertySchema: IJSONSchema = { type: 'string', description, format: 'color-hex', default: '#ff0000' };
+		if (deprecationMessage) {
+			propertySchema.deprecationMessage = deprecationMessage;
+		}
+		this.colorSchema.properties[id] = propertySchema;
 		this.colorReferenceSchema.enum.push(id);
 		this.colorReferenceSchema.enumDescriptions.push(description);
 		return id;
@@ -134,8 +138,8 @@ class ColorRegistry implements IColorRegistry {
 const colorRegistry = new ColorRegistry();
 platform.Registry.add(Extensions.ColorContribution, colorRegistry);
 
-export function registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency?: boolean): ColorIdentifier {
-	return colorRegistry.registerColor(id, defaults, description, needsTransparency);
+export function registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency?: boolean, deprecationMessage?: string): ColorIdentifier {
+	return colorRegistry.registerColor(id, defaults, description, needsTransparency, deprecationMessage);
 }
 
 export function getColorRegistry(): IColorRegistry {

From 128e1feca0e2e2305e0c42fca7f77739ef864d43 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 15:47:43 +0200
Subject: [PATCH 159/383] Stay focused (fixes #46749)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index d9fd0bf8c41..0934d56d57e 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -71,6 +71,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		const workbench = document.getElementById(this.partService.getWorkbenchElementId());
 		this.container = dom.append(workbench, $('.quick-input-widget'));
+		this.container.tabIndex = -1;
 		this.container.style.display = 'none';
 
 		const headerContainer = dom.append(this.container, $('.quick-input-header'));
@@ -137,6 +138,10 @@ export class QuickInputService extends Component implements IQuickInputService {
 		);
 
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
+			if (e.relatedTarget === this.container) {
+				(<HTMLElement>e.target).focus();
+				return;
+			}
 			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
 				if (element === this.container) {
 					return;

From e754b2f54417796e0457a4a938556db9b5e6e16d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 28 Mar 2018 15:50:39 +0200
Subject: [PATCH 160/383] hc theme - use contrastBorder to separate from title

---
 src/vs/workbench/common/theme.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index fc93969262c..13e52316a1c 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -361,7 +361,7 @@ export const TITLE_BAR_INACTIVE_BACKGROUND = registerColor('titleBar.inactiveBac
 export const TITLE_BAR_BORDER = registerColor('titleBar.border', {
 	dark: null,
 	light: null,
-	hc: null
+	hc: contrastBorder
 }, nls.localize('titleBarBorder', "Title bar border color. Note that this color is currently only supported on macOS."));
 
 // < --- Notifications --- >

From b08ba054ba6f00a5a7be0c10a1f55173db2b7d55 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 28 Mar 2018 16:06:03 +0200
Subject: [PATCH 161/383] [folding] Folded regions are lost when starting multi
 line comment Fixes Microsoft/vscode#46655

---
 extensions/html/language-configuration.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/html/language-configuration.json b/extensions/html/language-configuration.json
index 79ce9f9ce41..191f54303f1 100644
--- a/extensions/html/language-configuration.json
+++ b/extensions/html/language-configuration.json
@@ -13,7 +13,8 @@
 		{ "open": "[", "close": "]"},
 		{ "open": "(", "close": ")" },
 		{ "open": "'", "close": "'" },
-		{ "open": "\"", "close": "\"" }
+		{ "open": "\"", "close": "\"" },
+		{ "open": "<!--", "close": "-->", "notIn": [ "comment", "string" ]}
 	],
 	"surroundingPairs": [
 		{ "open": "'", "close": "'" },

From 4d454c1f2ff17548562e0be18118783cd86b0502 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 16:09:22 +0200
Subject: [PATCH 162/383] Arrow up to go to last item (fixes #46752)

---
 .../workbench/browser/parts/quickinput/quickInput.ts |  5 +++++
 .../parts/quickinput/quickInputCheckboxList.ts       | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 0934d56d57e..6752ef161c8 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -94,6 +94,11 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.toUnbind.push(this.inputBox.onKeyDown(event => {
 			switch (event.keyCode) {
 				case KeyCode.DownArrow:
+					this.checkboxList.focus('First');
+					this.checkboxList.domFocus();
+					break;
+				case KeyCode.UpArrow:
+					this.checkboxList.focus('Last');
 					this.checkboxList.domFocus();
 					break;
 			}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 89b1e171902..079c5dd4ea0 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -173,8 +173,14 @@ export class QuickInputCheckboxList {
 					this.toggleCheckbox();
 					break;
 				case KeyCode.UpArrow:
-					const focus = this.list.getFocus();
-					if (focus.length === 1 && focus[0] === 0) {
+					const focus1 = this.list.getFocus();
+					if (focus1.length === 1 && focus1[0] === 0) {
+						this._onLeave.fire();
+					}
+					break;
+				case KeyCode.DownArrow:
+					const focus2 = this.list.getFocus();
+					if (focus2.length === 1 && focus2[0] === this.list.length - 1) {
 						this._onLeave.fire();
 					}
 					break;
@@ -224,7 +230,7 @@ export class QuickInputCheckboxList {
 			.map(e => e.item);
 	}
 
-	focus(what: 'Next' | 'Previous' | 'NextPage' | 'PreviousPage'): void {
+	focus(what: 'First' | 'Last' | 'Next' | 'Previous' | 'NextPage' | 'PreviousPage'): void {
 		this.list['focus' + what]();
 	}
 

From 830ec658f59532371250996c764c8abe1610c438 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 28 Mar 2018 16:14:26 +0200
Subject: [PATCH 163/383] Fallback extracting to extension path if rename fails

---
 .../node/extensionManagementService.ts        | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 736f40fdde6..ac6b4972b71 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -401,10 +401,14 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
-		const extractPath = path.join(this.extensionsPath, `.${id}`); // Extract to temp path
-		return this.extract(id, zipPath, extractPath, { sourcePath: 'extension', overwrite: true })
-			.then(() => this.completeInstall(id, extractPath))
-			.then(() => this.scanExtension(id, this.extensionsPath, LocalExtensionType.User))
+		const tempPath = path.join(this.extensionsPath, `.${id}`);
+		const extensionPath = path.join(this.extensionsPath, id);
+		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
+			.then(null, e => this.extract(id, zipPath, path.join(this.extensionsPath, id)))
+			.then(() => {
+				this.logService.info('Installation completed.', id);
+				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
+			})
 			.then(local => {
 				if (metadata) {
 					local.metadata = metadata;
@@ -414,11 +418,22 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
-	private extract(id: string, zipPath: string, extractPath: string, options: any): TPromise<void> {
+	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string): TPromise<void> {
+		return this.extract(id, zipPath, extractPath)
+			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (5 * 1000) /* Retry for 5 seconds */)
+				.then(
+					() => this.logService.info('Renamed to', renamePath),
+					e => {
+						this.logService.info('Rename failed. Deleting from extracted location', extractPath);
+						return always(pfs.rimraf(extractPath), () => null).then(() => TPromise.wrapError(e));
+					}));
+	}
+
+	private extract(id: string, zipPath: string, extractPath: string): TPromise<void> {
 		this.logService.trace(`Started extracting the extension from ${zipPath} to ${extractPath}`);
 		return pfs.rimraf(extractPath)
 			.then(
-				() => extract(zipPath, extractPath, options)
+				() => extract(zipPath, extractPath, { sourcePath: 'extension', overwrite: true })
 					.then(
 						() => this.logService.info(`Extracted extension to ${extractPath}:`, id),
 						e => always(pfs.rimraf(extractPath), () => null)
@@ -426,23 +441,13 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				e => TPromise.wrapError(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_DELETING)));
 	}
 
-	private completeInstall(id: string, extractPath: string): TPromise<void> {
-		return this.rename(id, extractPath, Date.now() + (5 * 1000) /* Retry for 5 seconds */)
-			.then(
-				() => this.logService.info('Installation compelted.', id),
-				e => {
-					this.logService.info('Deleting the extracted extension', id);
-					return always(pfs.rimraf(extractPath), () => null)
-						.then(() => TPromise.wrapError(e));
-				});
-	}
-
-	private rename(id: string, extractPath: string, retryUntil: number): TPromise<void> {
-		return pfs.rename(extractPath, path.join(this.extensionsPath, id))
+	private rename(id: string, extractPath: string, renamePath: string, retryUntil: number): TPromise<void> {
+		return pfs.rename(extractPath, renamePath)
 			.then(null, error =>
 				isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil
-					? this.rename(id, extractPath, retryUntil)
-					: TPromise.wrapError(error));
+					? this.rename(id, extractPath, renamePath, retryUntil)
+					: TPromise.wrapError(error)
+			);
 	}
 
 	private rollback(extensions: IGalleryExtension[]): TPromise<void> {

From 17959a75c3bade873d803e23aa7fb589d61a01e4 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 16:17:49 +0200
Subject: [PATCH 164/383] Fixes #46301: Remove massaging of `deltaX` in
 mousewheel events on OSX

---
 src/vs/base/browser/ui/scrollbar/scrollableElement.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index c2434674bfc..5aafe0bd8a0 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -336,16 +336,6 @@ export abstract class AbstractScrollableElement extends Widget {
 				deltaY = 0;
 			}
 
-			if (Platform.isMacintosh) {
-				// Give preference to vertical scrolling
-				if (deltaY && Math.abs(deltaX) < 0.2) {
-					deltaX = 0;
-				}
-				if (Math.abs(deltaY) > Math.abs(deltaX) * 0.5) {
-					deltaX = 0;
-				}
-			}
-
 			const futureScrollPosition = this._scrollable.getFutureScrollPosition();
 
 			let desiredScrollPosition: INewScrollPosition = {};

From 90bb79d7165a59744d7ac3824e3efea930a37bda Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 16:32:15 +0200
Subject: [PATCH 165/383] Multi-select picker API: use 'canPickMany' and
 'picked' (fixes #46803)

---
 src/vs/platform/quickOpen/common/quickOpen.ts |   2 +-
 src/vs/vscode.d.ts                            |  12 +-
 src/vs/workbench/api/node/extHostQuickOpen.ts |   8 +-
 .../browser/parts/quickinput/quickInput.css   |   2 +-
 .../browser/parts/quickinput/quickInput.ts    |  30 ++---
 .../quickinput/quickInputCheckboxList.ts      | 108 +++++++++---------
 6 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index f7d70839e80..bb886241cf7 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -33,7 +33,7 @@ export interface IPickOpenEntry {
 	run?: (context: IEntryRunContext) => void;
 	action?: IAction;
 	payload?: any;
-	selected?: boolean;
+	picked?: boolean;
 }
 
 export interface IPickOpenItem {
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index a60af92a262..672f56eb55b 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1530,12 +1530,12 @@ declare module 'vscode' {
 		detail?: string;
 
 		/**
-		 * Optional flag indicating if this item is selected initially.
+		 * Optional flag indicating if this item is picked initially.
 		 * (Only honored when the picker allows multiple selections.)
 		 *
-		 * @see [QuickPickOptions.canSelectMany](#QuickPickOptions.canSelectMany)
+		 * @see [QuickPickOptions.canPickMany](#QuickPickOptions.canPickMany)
 		 */
-		selected?: boolean;
+		picked?: boolean;
 	}
 
 	/**
@@ -1565,7 +1565,7 @@ declare module 'vscode' {
 		/**
 		 * An optional flag to make the picker accept multiple selections, if true the result is an array of picks.
 		 */
-		canSelectMany?: boolean;
+		canPickMany?: boolean;
 
 		/**
 		 * An optional function that is invoked whenever an item is selected.
@@ -5083,7 +5083,7 @@ declare module 'vscode' {
 		 * @param token A token that can be used to signal cancellation.
 		 * @return A promise that resolves to the selected items or `undefined`.
 		 */
-		export function showQuickPick(items: string[] | Thenable<string[]>, options: QuickPickOptions & { canSelectMany: true; }, token?: CancellationToken): Thenable<string[] | undefined>;
+		export function showQuickPick(items: string[] | Thenable<string[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<string[] | undefined>;
 
 		/**
 		 * Shows a selection list.
@@ -5103,7 +5103,7 @@ declare module 'vscode' {
 		 * @param token A token that can be used to signal cancellation.
 		 * @return A promise that resolves to the selected items or `undefined`.
 		 */
-		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options: QuickPickOptions & { canSelectMany: true; }, token?: CancellationToken): Thenable<T[] | undefined>;
+		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<T[] | undefined>;
 
 		/**
 		 * Shows a selection list.
diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts
index 832853988d2..d2f5e8bbaec 100644
--- a/src/vs/workbench/api/node/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/node/extHostQuickOpen.ts
@@ -45,7 +45,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 			matchOnDescription: options && options.matchOnDescription,
 			matchOnDetail: options && options.matchOnDetail,
 			ignoreFocusLost: options && options.ignoreFocusOut,
-			canSelectMany: options && options.canSelectMany
+			canSelectMany: options && options.canPickMany
 		});
 
 		const promise = TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
@@ -62,7 +62,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 					let label: string;
 					let description: string;
 					let detail: string;
-					let selected: boolean;
+					let picked: boolean;
 
 					if (typeof item === 'string') {
 						label = item;
@@ -70,14 +70,14 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 						label = item.label;
 						description = item.description;
 						detail = item.detail;
-						selected = item.selected;
+						picked = item.picked;
 					}
 					pickItems.push({
 						label,
 						description,
 						handle,
 						detail,
-						selected
+						picked
 					});
 				}
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index ef10d0f6b9c..5ed9b89215f 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -17,7 +17,7 @@
 	padding: 6px 6px 4px 6px;
 }
 
-.quick-input-select-all {
+.quick-input-check-all {
 	align-self: center;
 	margin: 0;
 }
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 6752ef161c8..99bb1ed715b 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -42,7 +42,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	private layoutDimensions: Dimension;
 	private container: HTMLElement;
-	private selectAll: HTMLInputElement;
+	private checkAll: HTMLInputElement;
 	private inputBox: QuickInputBox;
 	private count: CountBadge;
 	private ready = false;
@@ -76,11 +76,11 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		const headerContainer = dom.append(this.container, $('.quick-input-header'));
 
-		this.selectAll = <HTMLInputElement>dom.append(headerContainer, $('input.quick-input-select-all'));
-		this.selectAll.type = 'checkbox';
-		this.toUnbind.push(dom.addStandardDisposableListener(this.selectAll, dom.EventType.CHANGE, e => {
-			const checked = this.selectAll.checked;
-			this.checkboxList.setAllVisibleSelected(checked);
+		this.checkAll = <HTMLInputElement>dom.append(headerContainer, $('input.quick-input-check-all'));
+		this.checkAll.type = 'checkbox';
+		this.toUnbind.push(dom.addStandardDisposableListener(this.checkAll, dom.EventType.CHANGE, e => {
+			const checked = this.checkAll.checked;
+			this.checkboxList.setAllVisibleChecked(checked);
 		}));
 
 		const filterContainer = dom.append(headerContainer, $('.quick-input-filter'));
@@ -112,7 +112,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		ok.textContent = localize('ok', "OK");
 		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => {
 			if (this.ready) {
-				this.close(this.checkboxList.getSelectedElements());
+				this.close(this.checkboxList.getCheckedElements());
 			}
 		}));
 
@@ -122,10 +122,10 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
 		this.toUnbind.push(this.checkboxList);
-		this.toUnbind.push(this.checkboxList.onAllVisibleSelectedChanged(allSelected => {
-			this.selectAll.checked = allSelected;
+		this.toUnbind.push(this.checkboxList.onAllVisibleCheckedChanged(checked => {
+			this.checkAll.checked = checked;
 		}));
-		this.toUnbind.push(this.checkboxList.onSelectedCountChanged(count => {
+		this.toUnbind.push(this.checkboxList.onCheckedCountChanged(count => {
 			this.count.setCount(count);
 		}));
 		this.toUnbind.push(this.checkboxList.onLeave(() => {
@@ -162,7 +162,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 				case KeyCode.Enter:
 					if (this.ready) {
 						dom.EventHelper.stop(e, true);
-						this.close(this.checkboxList.getSelectedElements());
+						this.close(this.checkboxList.getCheckedElements());
 					}
 					break;
 				case KeyCode.Escape:
@@ -211,8 +211,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.ready = false;
 
 		this.checkboxList.setElements([]);
-		this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
-		this.count.setCount(this.checkboxList.getSelectedCount());
+		this.checkAll.checked = this.checkboxList.getAllVisibleChecked();
+		this.count.setCount(this.checkboxList.getCheckedCount());
 
 		this.container.style.display = null;
 		this.updateLayout();
@@ -240,8 +240,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 			this.checkboxList.setElements(elements);
 			this.checkboxList.filter(this.inputBox.value);
-			this.selectAll.checked = this.checkboxList.getAllVisibleSelected();
-			this.count.setCount(this.checkboxList.getSelectedCount());
+			this.checkAll.checked = this.checkboxList.getAllVisibleChecked();
+			this.count.setCount(this.checkboxList.getCheckedCount());
 
 			this.updateLayout();
 		}).then(null, reason => this.close(TPromise.wrapError(reason)));
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 079c5dd4ea0..c837af9458e 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -25,57 +25,57 @@ import { memoize } from 'vs/base/common/decorators';
 
 const $ = dom.$;
 
-interface ISelectableElement {
+interface ICheckableElement {
 	index: number;
 	item: IPickOpenEntry;
-	selected: boolean;
+	checked: boolean;
 }
 
-class SelectableElement implements ISelectableElement {
+class CheckableElement implements ICheckableElement {
 	index: number;
 	item: IPickOpenEntry;
 	shouldAlwaysShow = false;
 	hidden = false;
-	private _onSelected = new Emitter<boolean>();
-	onSelected = this._onSelected.event;
-	_selected: boolean;
-	get selected() {
-		return this._selected;
+	private _onChecked = new Emitter<boolean>();
+	onChecked = this._onChecked.event;
+	_checked: boolean;
+	get checked() {
+		return this._checked;
 	}
-	set selected(value: boolean) {
-		if (value !== this._selected) {
-			this._selected = value;
-			this._onSelected.fire(value);
+	set checked(value: boolean) {
+		if (value !== this._checked) {
+			this._checked = value;
+			this._onChecked.fire(value);
 		}
 	}
 	labelHighlights?: IMatch[];
 	descriptionHighlights?: IMatch[];
 	detailHighlights?: IMatch[];
 
-	constructor(init: ISelectableElement) {
+	constructor(init: ICheckableElement) {
 		assign(this, init);
 	}
 }
 
-interface ISelectedElementTemplateData {
+interface ICheckableElementTemplateData {
 	checkbox: HTMLInputElement;
 	label: IconLabel;
 	detail: HighlightedLabel;
-	element: SelectableElement;
+	element: CheckableElement;
 	toDisposeElement: IDisposable[];
 	toDisposeTemplate: IDisposable[];
 }
 
-class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedElementTemplateData> {
+class CheckableElementRenderer implements IRenderer<CheckableElement, ICheckableElementTemplateData> {
 
-	static readonly ID = 'selectedelement';
+	static readonly ID = 'checkableelement';
 
 	get templateId() {
-		return SelectedElementRenderer.ID;
+		return CheckableElementRenderer.ID;
 	}
 
-	renderTemplate(container: HTMLElement): ISelectedElementTemplateData {
-		const data: ISelectedElementTemplateData = Object.create(null);
+	renderTemplate(container: HTMLElement): ICheckableElementTemplateData {
+		const data: ICheckableElementTemplateData = Object.create(null);
 
 		const entry = dom.append(container, $('.quick-input-checkbox-list-entry'));
 		const label = dom.append(entry, $('label.quick-input-checkbox-list-label'));
@@ -86,7 +86,7 @@ class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedE
 		data.toDisposeElement = [];
 		data.toDisposeTemplate = [];
 		data.toDisposeTemplate.push(dom.addStandardDisposableListener(data.checkbox, dom.EventType.CHANGE, e => {
-			data.element.selected = data.checkbox.checked;
+			data.element.checked = data.checkbox.checked;
 		}));
 
 		const rows = dom.append(label, $('.quick-input-checkbox-list-rows'));
@@ -103,11 +103,11 @@ class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedE
 		return data;
 	}
 
-	renderElement(element: SelectableElement, index: number, data: ISelectedElementTemplateData): void {
+	renderElement(element: CheckableElement, index: number, data: ICheckableElementTemplateData): void {
 		data.toDisposeElement = dispose(data.toDisposeElement);
 		data.element = element;
-		data.checkbox.checked = element.selected;
-		data.toDisposeElement.push(element.onSelected(selected => data.checkbox.checked = selected));
+		data.checkbox.checked = element.checked;
+		data.toDisposeElement.push(element.onChecked(checked => data.checkbox.checked = checked));
 
 		const { labelHighlights, descriptionHighlights, detailHighlights } = element;
 
@@ -122,34 +122,34 @@ class SelectedElementRenderer implements IRenderer<SelectableElement, ISelectedE
 		data.detail.set(element.item.detail, detailHighlights);
 	}
 
-	disposeTemplate(data: ISelectedElementTemplateData): void {
+	disposeTemplate(data: ICheckableElementTemplateData): void {
 		data.toDisposeElement = dispose(data.toDisposeElement);
 		data.toDisposeTemplate = dispose(data.toDisposeTemplate);
 	}
 }
 
-class SelectedElementDelegate implements IDelegate<SelectableElement> {
+class CheckableElementDelegate implements IDelegate<CheckableElement> {
 
-	getHeight(element: SelectableElement): number {
+	getHeight(element: CheckableElement): number {
 		return element.item.detail ? 44 : 22;
 	}
 
-	getTemplateId(element: SelectableElement): string {
-		return SelectedElementRenderer.ID;
+	getTemplateId(element: CheckableElement): string {
+		return CheckableElementRenderer.ID;
 	}
 }
 
 export class QuickInputCheckboxList {
 
 	private container: HTMLElement;
-	private list: WorkbenchList<SelectableElement>;
-	private elements: SelectableElement[] = [];
+	private list: WorkbenchList<CheckableElement>;
+	private elements: CheckableElement[] = [];
 	matchOnDescription = false;
 	matchOnDetail = false;
-	private _onAllVisibleSelectedChanged = new Emitter<boolean>(); // TODO: Debounce
-	onAllVisibleSelectedChanged: Event<boolean> = this._onAllVisibleSelectedChanged.event;
-	private _onSelectedCountChanged = new Emitter<number>(); // TODO: Debounce
-	onSelectedCountChanged: Event<number> = this._onSelectedCountChanged.event;
+	private _onAllVisibleCheckedChanged = new Emitter<boolean>(); // TODO: Debounce
+	onAllVisibleCheckedChanged: Event<boolean> = this._onAllVisibleCheckedChanged.event;
+	private _onCheckedCountChanged = new Emitter<number>(); // TODO: Debounce
+	onCheckedCountChanged: Event<number> = this._onCheckedCountChanged.event;
 	private _onLeave = new Emitter<void>();
 	onLeave: Event<void> = this._onLeave.event;
 	private elementDisposables: IDisposable[] = [];
@@ -160,11 +160,11 @@ export class QuickInputCheckboxList {
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
 		this.container = dom.append(this.parent, $('.quick-input-checkbox-list'));
-		const delegate = new SelectedElementDelegate();
-		this.list = this.instantiationService.createInstance(WorkbenchList, this.container, delegate, [new SelectedElementRenderer()], {
+		const delegate = new CheckableElementDelegate();
+		this.list = this.instantiationService.createInstance(WorkbenchList, this.container, delegate, [new CheckableElementRenderer()], {
 			identityProvider: element => element.label,
 			multipleSelectionSupport: false
-		}) as WorkbenchList<SelectableElement>;
+		}) as WorkbenchList<CheckableElement>;
 		this.disposables.push(this.list);
 		this.disposables.push(this.list.onKeyDown(e => {
 			const event = new StandardKeyboardEvent(e);
@@ -193,40 +193,40 @@ export class QuickInputCheckboxList {
 		return mapEvent(this.list.onFocusChange, e => e.elements.map(e => e.item));
 	}
 
-	getAllVisibleSelected() {
-		return !this.elements.some(element => !element.hidden && !element.selected);
+	getAllVisibleChecked() {
+		return !this.elements.some(element => !element.hidden && !element.checked);
 	}
 
-	getSelectedCount() {
-		return this.getSelectedElements().length;
+	getCheckedCount() {
+		return this.getCheckedElements().length;
 	}
 
-	setAllVisibleSelected(select: boolean) {
+	setAllVisibleChecked(checked: boolean) {
 		this.elements.forEach(element => {
 			if (!element.hidden) {
-				element.selected = select;
+				element.checked = checked;
 			}
 		});
 	}
 
 	setElements(elements: IPickOpenEntry[]): void {
 		this.elementDisposables = dispose(this.elementDisposables);
-		this.elements = elements.map((item, index) => new SelectableElement({
+		this.elements = elements.map((item, index) => new CheckableElement({
 			index,
 			item,
-			selected: !!item.selected
+			checked: !!item.picked
 		}));
-		this.elementDisposables.push(...this.elements.map(element => element.onSelected(() => {
-			this._onAllVisibleSelectedChanged.fire(this.getAllVisibleSelected());
-			this._onSelectedCountChanged.fire(this.getSelectedCount());
+		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => {
+			this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
+			this._onCheckedCountChanged.fire(this.getCheckedCount());
 		})));
 		this.list.splice(0, this.list.length, this.elements);
 		this.list.setSelection([]);
 		this.list.focusFirst();
 	}
 
-	getSelectedElements() {
-		return this.elements.filter(e => e.selected)
+	getCheckedElements() {
+		return this.elements.filter(e => e.checked)
 			.map(e => e.item);
 	}
 
@@ -290,13 +290,13 @@ export class QuickInputCheckboxList {
 		this.list.focusFirst();
 		this.list.layout();
 
-		this._onAllVisibleSelectedChanged.fire(this.getAllVisibleSelected());
+		this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
 	}
 
 	toggleCheckbox() {
 		const elements = this.list.getFocusedElements();
 		for (const element of elements) {
-			element.selected = !element.selected;
+			element.checked = !element.checked;
 		}
 	}
 
@@ -306,7 +306,7 @@ export class QuickInputCheckboxList {
 	}
 }
 
-function compareEntries(elementA: SelectableElement, elementB: SelectableElement, lookFor: string): number {
+function compareEntries(elementA: CheckableElement, elementB: CheckableElement, lookFor: string): number {
 
 	const labelHighlightsA = elementA.labelHighlights || [];
 	const labelHighlightsB = elementB.labelHighlights || [];

From 49d3698e9cabe0cb9192991d3715ce5b42c836f2 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Wed, 28 Mar 2018 16:55:38 +0200
Subject: [PATCH 166/383] fixes #44411

---
 .../electron-browser/configurationResolverService.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
index e8d49f21309..ca7fe4016c3 100644
--- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -168,7 +168,7 @@ class VariableResolver {
 							return this.environmentService.execPath;
 
 						default:
-							return match;
+							throw new Error(localize('canNotResolveUnkownVariable', "{0} can not be resolved, unknown variable.", match));
 					}
 				}
 			}

From ae26bd890641ea42ff3f82b564c2d57e50e3a45d Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 17:16:35 +0200
Subject: [PATCH 167/383] Multi Quick-Pick: Performance with many items (fixes
 #46666)

---
 src/vs/base/browser/ui/list/listWidget.ts     |  2 +-
 .../quickinput/quickInputCheckboxList.ts      | 47 ++++++++++++++-----
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 8026e676bdd..a93a19f2be3 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -142,7 +142,7 @@ class Trait<T> implements ISpliceable<boolean>, IDisposable {
 		const end = start + deleteCount;
 		const indexes = [
 			...this.indexes.filter(i => i < start),
-			...elements.reduce((r, hasTrait, i) => hasTrait ? [...r, i + start] : r, []),
+			...elements.map((hasTrait, i) => hasTrait ? i + start : -1).filter(i => i !== -1),
 			...this.indexes.filter(i => i >= end).map(i => i + diff)
 		];
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index c837af9458e..fcc31e8d73b 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -152,6 +152,7 @@ export class QuickInputCheckboxList {
 	onCheckedCountChanged: Event<number> = this._onCheckedCountChanged.event;
 	private _onLeave = new Emitter<void>();
 	onLeave: Event<void> = this._onLeave.event;
+	private _fireCheckedEvents = true;
 	private elementDisposables: IDisposable[] = [];
 	private disposables: IDisposable[] = [];
 
@@ -194,19 +195,39 @@ export class QuickInputCheckboxList {
 	}
 
 	getAllVisibleChecked() {
-		return !this.elements.some(element => !element.hidden && !element.checked);
+		const elements = this.elements;
+		for (let i = 0, n = elements.length; i < n; i++) {
+			const element = elements[i];
+			if (!element.hidden && !element.checked) {
+				return false;
+			}
+		}
+		return true;
 	}
 
 	getCheckedCount() {
-		return this.getCheckedElements().length;
+		let count = 0;
+		const elements = this.elements;
+		for (let i = 0, n = elements.length; i < n; i++) {
+			if (elements[i].checked) {
+				count++;
+			}
+		}
+		return count;
 	}
 
 	setAllVisibleChecked(checked: boolean) {
-		this.elements.forEach(element => {
-			if (!element.hidden) {
-				element.checked = checked;
-			}
-		});
+		try {
+			this._fireCheckedEvents = false;
+			this.elements.forEach(element => {
+				if (!element.hidden) {
+					element.checked = checked;
+				}
+			});
+		} finally {
+			this._fireCheckedEvents = true;
+			this.fireCheckedEvents();
+		}
 	}
 
 	setElements(elements: IPickOpenEntry[]): void {
@@ -216,10 +237,7 @@ export class QuickInputCheckboxList {
 			item,
 			checked: !!item.picked
 		}));
-		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => {
-			this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
-			this._onCheckedCountChanged.fire(this.getCheckedCount());
-		})));
+		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents())));
 		this.list.splice(0, this.list.length, this.elements);
 		this.list.setSelection([]);
 		this.list.focusFirst();
@@ -304,6 +322,13 @@ export class QuickInputCheckboxList {
 		this.elementDisposables = dispose(this.elementDisposables);
 		this.disposables = dispose(this.disposables);
 	}
+
+	private fireCheckedEvents() {
+		if (this._fireCheckedEvents) {
+			this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
+			this._onCheckedCountChanged.fire(this.getCheckedCount());
+		}
+	}
 }
 
 function compareEntries(elementA: CheckableElement, elementB: CheckableElement, lookFor: string): number {

From 5c6f2f92aeee60319c3c7e0de0f8ac6d04e594f2 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Wed, 28 Mar 2018 17:20:45 +0200
Subject: [PATCH 168/383] configuration resovler error message put quotes for
 better readibility

---
 .../configurationResolverService.ts           | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
index ca7fe4016c3..a0465c68f36 100644
--- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -93,10 +93,10 @@ class VariableResolver {
 								return normalizeDriveLetter(context.uri.fsPath);
 							}
 							if (this.workspaceContextService.getWorkspace().folders.length > 1) {
-								throw new Error(localize('canNotResolveWorkspaceFolderMultiRoot', "${workspaceFolder} can not be resolved in a multi folder workspace. Scope this variables using : and a folder name."));
+								throw new Error(localize('canNotResolveWorkspaceFolderMultiRoot', "'${workspaceFolder}' can not be resolved in a multi folder workspace. Scope this variables using : and a folder name."));
 							}
 
-							throw new Error(localize('canNotResolveWorkspaceFolder', "${workspaceFolder} can not be resolved. Please open a folder."));
+							throw new Error(localize('canNotResolveWorkspaceFolder', "'${workspaceFolder}' can not be resolved. Please open a folder."));
 						} case 'cwd':
 							return context ? normalizeDriveLetter(context.uri.fsPath) : process.cwd();
 						case 'workspaceRootFolderName':
@@ -105,30 +105,30 @@ class VariableResolver {
 								return paths.basename(context.uri.fsPath);
 							}
 							if (this.workspaceContextService.getWorkspace().folders.length > 1) {
-								throw new Error(localize('canNotResolveFolderBasenameMultiRoot', "${workspaceFolderBasename} can not be resolved in a multi folder workspace. Scope this variables using : and a folder name."));
+								throw new Error(localize('canNotResolveFolderBasenameMultiRoot', "'${workspaceFolderBasename}' can not be resolved in a multi folder workspace. Scope this variables using : and a folder name."));
 							}
 
-							throw new Error(localize('canNotResolveFolderBasename', "${workspaceFolderBasename} can not be resolved. Please open a folder."));
+							throw new Error(localize('canNotResolveFolderBasename', "'${workspaceFolderBasename}' can not be resolved. Please open a folder."));
 						} case 'lineNumber': {
 							const lineNumber = this.getLineNumber();
 							if (lineNumber) {
 								return lineNumber;
 							}
 
-							throw new Error(localize('canNotResolveLineNumber', "${lineNumber} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveLineNumber', "'${lineNumber}' can not be resolved, please open an editor."));
 						} case 'selectedText': {
 							const selectedText = this.getSelectedText();
 							if (selectedText) {
 								return selectedText;
 							}
 
-							throw new Error(localize('canNotResolveSelectedText', "${selectedText} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveSelectedText', "'${selectedText}' can not be resolved, please open an editor."));
 						} case 'file': {
 							if (filePath) {
 								return filePath;
 							}
 
-							throw new Error(localize('canNotResolveFile', "${file} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveFile', "'${file}' can not be resolved, please open an editor."));
 						} case 'relativeFile': {
 							if (context && filePath) {
 								return paths.normalize(relative(context.uri.fsPath, filePath));
@@ -137,38 +137,38 @@ class VariableResolver {
 								return filePath;
 							}
 
-							throw new Error(localize('canNotResolveRelativeFile', "${relativeFile} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveRelativeFile', "'${relativeFile}' can not be resolved, please open an editor."));
 						} case 'fileDirname': {
 							if (filePath) {
 								return paths.dirname(filePath);
 							}
 
-							throw new Error(localize('canNotResolveFileDirname', "${fileDirname} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveFileDirname', "'${fileDirname}' can not be resolved, please open an editor."));
 						} case 'fileExtname': {
 							if (filePath) {
 								return paths.extname(filePath);
 							}
 
-							throw new Error(localize('canNotResolveFileExtname', "${fileExtname} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveFileExtname', "'${fileExtname}' can not be resolved, please open an editor."));
 						} case 'fileBasename': {
 							if (filePath) {
 								return paths.basename(filePath);
 							}
 
-							throw new Error(localize('canNotResolveFileBasename', "${fileBasename} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveFileBasename', "'${fileBasename}' can not be resolved, please open an editor."));
 						} case 'fileBasenameNoExtension': {
 							if (filePath) {
 								const basename = paths.basename(filePath);
 								return basename.slice(0, basename.length - paths.extname(basename).length);
 							}
 
-							throw new Error(localize('canNotResolveFileBasenameNoExtension', "${fileBasenameNoExtension} can not be resolved, please open an editor."));
+							throw new Error(localize('canNotResolveFileBasenameNoExtension', "'${fileBasenameNoExtension}' can not be resolved, please open an editor."));
 						}
 						case 'execPath':
 							return this.environmentService.execPath;
 
 						default:
-							throw new Error(localize('canNotResolveUnkownVariable', "{0} can not be resolved, unknown variable.", match));
+							throw new Error(localize('canNotResolveUnkownVariable', "'{0}' can not be resolved, unknown variable.", match));
 					}
 				}
 			}

From c21a44b6c015bb109826fe44903a9f6f4b7b66d4 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 28 Mar 2018 17:28:26 +0200
Subject: [PATCH 169/383] Fix #46857

---
 src/vs/workbench/browser/parts/views/customView.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index 66f4b10dd65..0399b1e7df4 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -265,7 +265,7 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 			return result.then(() => this.tree.reveal(item))
 				.then(() => {
 					if (select) {
-						this.tree.setSelection([item]);
+						this.tree.setSelection([item], { source: 'api' });
 					}
 				});
 		}
@@ -287,6 +287,9 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 	}
 
 	private onSelection({ payload }: any): void {
+		if (payload && payload.source === 'api') {
+			return;
+		}
 		const selection: ITreeItem = this.tree.getSelection()[0];
 		if (selection) {
 			if (selection.command) {

From 1549c3711e1ce36c7b1ab69de4c928be16a565b4 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Wed, 28 Mar 2018 17:30:41 +0200
Subject: [PATCH 170/383] revert throw error for unknown variable

---
 .../electron-browser/configurationResolverService.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
index a0465c68f36..fb77a1d5bb5 100644
--- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -168,7 +168,7 @@ class VariableResolver {
 							return this.environmentService.execPath;
 
 						default:
-							throw new Error(localize('canNotResolveUnkownVariable', "'{0}' can not be resolved, unknown variable.", match));
+							return match;
 					}
 				}
 			}

From df4d84f7f64c10f470aaf6bec2c6cfa7d892cf1b Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 28 Mar 2018 17:37:24 +0200
Subject: [PATCH 171/383] Ctrl+A to select all (fixes #46665)

---
 .../quickinput/quickInputCheckboxList.ts      | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index fcc31e8d73b..626ba4fe499 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -22,6 +22,8 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { memoize } from 'vs/base/common/decorators';
+import { range } from 'vs/base/common/arrays';
+import * as platform from 'vs/base/common/platform';
 
 const $ = dom.$;
 
@@ -173,6 +175,11 @@ export class QuickInputCheckboxList {
 				case KeyCode.Space:
 					this.toggleCheckbox();
 					break;
+				case KeyCode.KEY_A:
+					if (platform.isMacintosh ? e.metaKey : e.ctrlKey) {
+						this.list.setFocus(range(this.list.length));
+					}
+					break;
 				case KeyCode.UpArrow:
 					const focus1 = this.list.getFocus();
 					if (focus1.length === 1 && focus1[0] === 0) {
@@ -195,7 +202,10 @@ export class QuickInputCheckboxList {
 	}
 
 	getAllVisibleChecked() {
-		const elements = this.elements;
+		return this.allVisibleChecked(this.elements);
+	}
+
+	private allVisibleChecked(elements: CheckableElement[]) {
 		for (let i = 0, n = elements.length; i < n; i++) {
 			const element = elements[i];
 			if (!element.hidden && !element.checked) {
@@ -312,9 +322,16 @@ export class QuickInputCheckboxList {
 	}
 
 	toggleCheckbox() {
-		const elements = this.list.getFocusedElements();
-		for (const element of elements) {
-			element.checked = !element.checked;
+		try {
+			this._fireCheckedEvents = false;
+			const elements = this.list.getFocusedElements();
+			const allChecked = this.allVisibleChecked(elements);
+			for (const element of elements) {
+				element.checked = !allChecked;
+			}
+		} finally {
+			this._fireCheckedEvents = true;
+			this.fireCheckedEvents();
 		}
 	}
 

From 2771863f43287b7a8ec14feb85d0653d3bbba43d Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 28 Mar 2018 08:41:05 -0700
Subject: [PATCH 172/383] Add more terminal logging

Part of #43169
---
 .../terminal/electron-browser/terminalInstance.ts  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 21ec8a5ea72..91ec22cb780 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -704,10 +704,10 @@ export class TerminalInstance implements ITerminalInstance {
 		// Continue env initialization, merging in the env from the launch
 		// config and adding keys that are needed to create the process
 		const env = TerminalInstance.createTerminalEnv(parentEnv, this._shellLaunchConfig, this._initialCwd, locale, this._cols, this._rows);
-		this._process = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], {
-			env,
-			cwd: Uri.parse(path.dirname(require.toUrl('../node/terminalProcess'))).fsPath
-		});
+		const cwd = Uri.parse(path.dirname(require.toUrl('../node/terminalProcess'))).fsPath;
+		const options = { env, cwd };
+		this._logService.debug(`Terminal process launching (id: ${this.id})`, options);
+		this._process = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], options);
 		this._processState = ProcessState.LAUNCHING;
 
 		if (this._shellLaunchConfig.name) {
@@ -756,6 +756,7 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	private _sendPtyDataToXterm(message: { type: string, content: string }): void {
+		this._logService.debug(`Terminal process message (id: ${this.id})`, message);
 		if (message.type === 'data') {
 			if (this._widgetManager) {
 				this._widgetManager.closeMessage();
@@ -767,6 +768,8 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	private _onPtyProcessExit(exitCode: number): void {
+		this._logService.debug(`Terminal process exit (id: ${this.id}) with code ${exitCode}`);
+
 		// Prevent dispose functions being triggered multiple times
 		if (this._isExiting) {
 			return;
@@ -793,6 +796,9 @@ export class TerminalInstance implements ITerminalInstance {
 			this._processState = ProcessState.KILLED_BY_PROCESS;
 		}
 
+
+		this._logService.debug(`Terminal process exit (id: ${this.id}) state ${this._processState}`);
+
 		// Only trigger wait on exit when the exit was *not* triggered by the
 		// user (via the `workbench.action.terminal.kill` command).
 		if (this._shellLaunchConfig.waitOnExit && this._processState !== ProcessState.KILLED_BY_USER) {

From 8a8c0186007adb20893976a8306aa32f4259ff65 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Wed, 28 Mar 2018 18:07:48 +0200
Subject: [PATCH 173/383] breakpoint widget: more precise context

fixes #46742
---
 src/vs/workbench/parts/debug/common/debug.ts               | 1 +
 .../parts/debug/electron-browser/breakpointWidget.ts       | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 5d92e818732..f8329099438 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -37,6 +37,7 @@ export const CONTEXT_NOT_IN_DEBUG_REPL: ContextKeyExpr = CONTEXT_IN_DEBUG_REPL.t
 export const CONTEXT_ON_FIRST_DEBUG_REPL_LINE = new RawContextKey<boolean>('onFirstDebugReplLine', false);
 export const CONTEXT_ON_LAST_DEBUG_REPL_LINE = new RawContextKey<boolean>('onLastDebugReplLine', false);
 export const CONTEXT_BREAKPOINT_WIDGET_VISIBLE = new RawContextKey<boolean>('breakpointWidgetVisible', false);
+export const CONTEXT_IN_BREAKPOINT_WIDGET = new RawContextKey<boolean>('inBreakpointWidget', false);
 export const CONTEXT_BREAKPOINTS_FOCUSED = new RawContextKey<boolean>('breakpointsFocused', true);
 export const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = new RawContextKey<boolean>('watchExpressionsFocused', true);
 export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFocused', true);
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index 5deb9e1cb89..18cc9b3fe5b 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -14,7 +14,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IDebugService, IBreakpoint, BreakpointWidgetContext as Context, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DEBUG_SCHEME, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID } from 'vs/workbench/parts/debug/common/debug';
+import { IDebugService, IBreakpoint, BreakpointWidgetContext as Context, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DEBUG_SCHEME, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, CONTEXT_IN_BREAKPOINT_WIDGET } from 'vs/workbench/parts/debug/common/debug';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { SimpleDebugEditor } from 'vs/workbench/parts/debug/electron-browser/simpleDebugEditor';
@@ -203,6 +203,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWi
 
 		const options = SimpleDebugEditor.getEditorOptions();
 		this.input = scopedInstatiationService.createInstance(SimpleDebugEditor, container, options);
+		CONTEXT_IN_BREAKPOINT_WIDGET.bindTo(scopedContextKeyService).set(true);
 		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:breakpointinput`), true);
 		this.input.setModel(model);
 		this.toDispose.push(model);
@@ -284,9 +285,9 @@ class AcceptBreakpointWidgetInputAction extends EditorCommand {
 	constructor() {
 		super({
 			id: 'breakpointWidget.action.acceptInput',
-			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE, // TODO@Isidor need a more specific context key if breakpoint widget is focused
+			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
 			kbOpts: {
-				kbExpr: EditorContextKeys.textInputFocus,
+				kbExpr: CONTEXT_IN_BREAKPOINT_WIDGET,
 				primary: KeyCode.Enter
 			}
 		});

From c5e19bcfd8de29ab315a2f677b22e8f90c5ec42c Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 18:18:22 +0200
Subject: [PATCH 174/383] Avoid allocation in most-likely case for
 validateRange and validatePosition

---
 src/vs/editor/common/model/textModel.ts | 84 +++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index ac9a6b5e49b..e169ad2684c 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -881,6 +881,41 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return new Range(startLineNumber, startColumn, endLineNumber, endColumn);
 	}
 
+	/**
+	 * @param strict Do NOT allow a position inside a high-low surrogate pair
+	 */
+	private _isValidPosition(lineNumber: number, column: number, strict: boolean): boolean {
+
+		if (lineNumber < 1) {
+			return false;
+		}
+
+		const lineCount = this._buffer.getLineCount();
+		if (lineNumber > lineCount) {
+			return false;
+		}
+
+		if (column < 1) {
+			return false;
+		}
+
+		const maxColumn = this.getLineMaxColumn(lineNumber);
+		if (column > maxColumn) {
+			return false;
+		}
+
+		if (strict) {
+			if (column > 1) {
+				const charCodeBefore = this._buffer.getLineCharCode(lineNumber, column - 2);
+				if (strings.isHighSurrogate(charCodeBefore)) {
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * @param strict Do NOT allow a position inside a high-low surrogate pair
 	 */
@@ -921,11 +956,60 @@ export class TextModel extends Disposable implements model.ITextModel {
 
 	public validatePosition(position: IPosition): Position {
 		this._assertNotDisposed();
+
+		// Avoid object allocation and cover most likely case
+		if (position instanceof Position) {
+			if (this._isValidPosition(position.lineNumber, position.column, true)) {
+				return position;
+			}
+		}
+
 		return this._validatePosition(position.lineNumber, position.column, true);
 	}
 
+	/**
+	 * @param strict Do NOT allow a range to have its boundaries inside a high-low surrogate pair
+	 */
+	private _isValidRange(range: Range, strict: boolean): boolean {
+		const startLineNumber = range.startLineNumber;
+		const startColumn = range.startColumn;
+		const endLineNumber = range.endLineNumber;
+		const endColumn = range.endColumn;
+
+		if (!this._isValidPosition(startLineNumber, startColumn, false)) {
+			return false;
+		}
+		if (!this._isValidPosition(endLineNumber, endColumn, false)) {
+			return false;
+		}
+
+		if (strict) {
+			const charCodeBeforeStart = (startColumn > 1 ? this._buffer.getLineCharCode(startLineNumber, startColumn - 2) : 0);
+			const charCodeBeforeEnd = (endColumn > 1 && endColumn <= this._buffer.getLineLength(endLineNumber) ? this._buffer.getLineCharCode(endLineNumber, endColumn - 2) : 0);
+
+			const startInsideSurrogatePair = strings.isHighSurrogate(charCodeBeforeStart);
+			const endInsideSurrogatePair = strings.isHighSurrogate(charCodeBeforeEnd);
+
+			if (!startInsideSurrogatePair && !endInsideSurrogatePair) {
+				return true;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
 	public validateRange(_range: IRange): Range {
 		this._assertNotDisposed();
+
+		// Avoid object allocation and cover most likely case
+		if ((_range instanceof Range) && !(_range instanceof Selection)) {
+			if (this._isValidRange(_range, true)) {
+				return _range;
+			}
+		}
+
 		const start = this._validatePosition(_range.startLineNumber, _range.startColumn, false);
 		const end = this._validatePosition(_range.endLineNumber, _range.endColumn, false);
 

From aa9e771f2baf7c49926d9059aca3cc5c9b8d39e6 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 28 Mar 2018 09:24:18 -0700
Subject: [PATCH 175/383] Move command to middle when selecting to terminal
 commands

Fixes #46724
---
 .../terminal/node/terminalCommandTracker.ts   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts b/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
index a5e08c5a28a..7229460ec01 100644
--- a/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
@@ -16,6 +16,11 @@ enum Boundary {
 	Bottom
 }
 
+export enum ScrollPosition {
+	Top,
+	Middle
+}
+
 export class TerminalCommandTracker implements ITerminalCommandTracker {
 	private _currentMarker: IMarker | Boundary = Boundary.Bottom;
 	private _selectionStart: IMarker | Boundary | null = null;
@@ -43,7 +48,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		}
 	}
 
-	public scrollToPreviousCommand(retainSelection: boolean = false): void {
+	public scrollToPreviousCommand(scrollPosition: ScrollPosition = ScrollPosition.Top, retainSelection: boolean = false): void {
 		if (!retainSelection) {
 			this._selectionStart = null;
 		}
@@ -64,10 +69,10 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		}
 
 		this._currentMarker = this._xterm.markers[markerIndex];
-		this._xterm.scrollToLine(this._currentMarker.line);
+		this._scrollToMarker(this._currentMarker, scrollPosition);
 	}
 
-	public scrollToNextCommand(retainSelection: boolean = false): void {
+	public scrollToNextCommand(scrollPosition: ScrollPosition = ScrollPosition.Top, retainSelection: boolean = false): void {
 		if (!retainSelection) {
 			this._selectionStart = null;
 		}
@@ -88,14 +93,22 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		}
 
 		this._currentMarker = this._xterm.markers[markerIndex];
-		this._xterm.scrollToLine(this._currentMarker.line);
+		this._scrollToMarker(this._currentMarker, scrollPosition);
+	}
+
+	private _scrollToMarker(marker: IMarker, position: ScrollPosition): void {
+		let line = marker.line;
+		if (position === ScrollPosition.Middle) {
+			line = Math.max(line - this._xterm.rows / 2, 0);
+		}
+		this._xterm.scrollToLine(line);
 	}
 
 	public selectToPreviousCommand(): void {
 		if (this._selectionStart === null) {
 			this._selectionStart = this._currentMarker;
 		}
-		this.scrollToPreviousCommand(true);
+		this.scrollToPreviousCommand(ScrollPosition.Middle, true);
 		this._selectLines(this._currentMarker, this._selectionStart);
 	}
 
@@ -103,7 +116,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		if (this._selectionStart === null) {
 			this._selectionStart = this._currentMarker;
 		}
-		this.scrollToNextCommand(true);
+		this.scrollToNextCommand(ScrollPosition.Middle, true);
 		this._selectLines(this._currentMarker, this._selectionStart);
 	}
 

From 97ff53076c1c6462c13642a619f059841d87b946 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 18:31:48 +0200
Subject: [PATCH 176/383] Fix issue #46075: Validate range before checking if
 it is empty

---
 .../workbench/api/electron-browser/mainThreadSaveParticipant.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index 0eca49dbbd0..bfa416d8b51 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -166,7 +166,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
 			currentLineIsEmptyOrWhitespace = strings.lastNonWhitespaceIndex(currentLine) === -1;
 		}
 
-		const deletionRange = new Range(currentLineNumber + 1, 1, lineCount, 1);
+		const deletionRange = model.validateRange(new Range(currentLineNumber + 1, 1, lineCount + 1, 1));
 		if (!deletionRange.isEmpty()) {
 			model.pushEditOperations(prevSelection, [EditOperation.delete(deletionRange)], edits => prevSelection);
 		}

From 8a635190994cb46f226420e56585a1d0b8f33629 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 28 Mar 2018 09:30:03 -0700
Subject: [PATCH 177/383] Rearrange the fields in the issue reporter, fixes
 #46786

---
 .../issue/issueReporterPage.ts                 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
index 045a35fb717..96a819be1df 100644
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -19,15 +19,6 @@ export default (): string => `
 			</select>
 		</div>
 
-		<div class="input-group">
-			<label class="inline-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
-			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
-			<div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(localize('titleLengthValidation', "The title is too long."))}</div>
-			<small id="similar-issues">
-				<!-- To be dynamically filled -->
-			</small>
-		</div>
-
 		<div class="input-group" id="problem-source">
 			<label class="inline-label" for="issue-source">${escape(localize('issueSourceLabel', "File on"))}</label>
 			<select id="issue-source" class="inline-form-control">
@@ -46,6 +37,15 @@ export default (): string => `
 			</div>
 		</div>
 
+		<div class="input-group">
+			<label class="inline-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
+			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
+			<div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(localize('titleLengthValidation', "The title is too long."))}</div>
+			<small id="similar-issues">
+				<!-- To be dynamically filled -->
+			</small>
+		</div>
+
 	</div>
 
 	<div class="system-info" id="block-container">

From 3fca70781ecf7f54ac78081a5b01ecb7d3c6b20a Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 28 Mar 2018 10:52:47 -0700
Subject: [PATCH 178/383] Don't show help text when filing against an
 extension, fixes #46787

---
 src/vs/code/electron-browser/issue/issueReporterMain.ts | 9 +++++----
 src/vs/code/electron-browser/issue/issueReporterPage.ts | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 78aa4c56373..6af83069392 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -624,6 +624,7 @@ export class IssueReporter extends Disposable {
 		const settingsSearchResultsBlock = document.querySelector('.block-settingsSearchResults');
 
 		const problemSource = document.getElementById('problem-source');
+		const problemSourceHelpText = document.getElementById('problem-source-help-text');
 		const descriptionTitle = document.getElementById('issue-description-label');
 		const descriptionSubtitle = document.getElementById('issue-description-subtitle');
 		const extensionSelector = document.getElementById('extension-selection');
@@ -637,6 +638,8 @@ export class IssueReporter extends Disposable {
 		hide(searchedExtensionsBlock);
 		hide(settingsSearchResultsBlock);
 		hide(problemSource);
+		hide(problemSourceHelpText);
+		hide(extensionSelector);
 
 		if (issueType === IssueType.Bug) {
 			show(blockContainer);
@@ -644,11 +647,10 @@ export class IssueReporter extends Disposable {
 			show(problemSource);
 
 			if (fileOnExtension) {
-				hide(extensionsBlock);
 				show(extensionSelector);
 			} else {
 				show(extensionsBlock);
-				hide(extensionSelector);
+				show(problemSourceHelpText);
 			}
 
 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
@@ -662,11 +664,10 @@ export class IssueReporter extends Disposable {
 			show(problemSource);
 
 			if (fileOnExtension) {
-				hide(extensionsBlock);
 				show(extensionSelector);
 			} else {
 				show(extensionsBlock);
-				hide(extensionSelector);
+				show(problemSourceHelpText);
 			}
 
 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
index 96a819be1df..4991cd98b70 100644
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -25,7 +25,7 @@ export default (): string => `
 				<option value="false">${escape(localize('vscode', "Visual Studio Code"))}</option>
 				<option value="true">${escape(localize('extension', "An Extension"))}</option>
 			</select>
-			<div class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."))
+			<div id="problem-source-help-text" class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."))
 		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
 			</div>
 

From 9e0374f29f81fd8038b2633f2cc4cd69ac682759 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Wed, 28 Mar 2018 21:13:36 +0200
Subject: [PATCH 179/383] Fixes #46709: Tasks: Single/double quotes not
 quoted/escaped

---
 .../tasks/electron-browser/terminalTaskSystem.ts     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index 17de814f26e..02621b26855 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -62,18 +62,24 @@ export class TerminalTaskSystem implements ITaskSystem {
 		'powershell': {
 			escape: {
 				escapeChar: '`',
-				charsToEscape: ` ()`
+				charsToEscape: ' "\'()'
 			},
 			strong: '\'',
 			weak: '"'
 		},
 		'bash': {
-			escape: '\\',
+			escape: {
+				escapeChar: '\\',
+				charsToEscape: ' "\''
+			},
 			strong: '\'',
 			weak: '"'
 		},
 		'zsh': {
-			escape: '\\',
+			escape: {
+				escapeChar: '\\',
+				charsToEscape: ' "\''
+			},
 			strong: '\'',
 			weak: '"'
 		}

From d9d762d1ceea893ded09d625cfcd689c1187a860 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 28 Mar 2018 21:39:44 +0200
Subject: [PATCH 180/383] [css] .asar file breaks CSS path completion. Fixes
 #46638

---
 .../server/src/pathCompletion.ts                   | 10 +++++++---
 .../server/src/test/completion.test.ts             | 14 ++++++++++++++
 .../test/pathCompletionFixtures/src/data/foo.asar  |  4 ++++
 .../server/src/modes/pathCompletion.ts             | 10 +++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar

diff --git a/extensions/css-language-features/server/src/pathCompletion.ts b/extensions/css-language-features/server/src/pathCompletion.ts
index 76b93f3a628..2f840184a14 100644
--- a/extensions/css-language-features/server/src/pathCompletion.ts
+++ b/extensions/css-language-features/server/src/pathCompletion.ts
@@ -10,7 +10,7 @@ import URI from 'vscode-uri';
 
 import { TextDocument, CompletionList, CompletionItemKind, CompletionItem, TextEdit, Range, Position } from 'vscode-languageserver-types';
 import { WorkspaceFolder } from 'vscode-languageserver';
-import { ICompletionParticipant } from 'vscode-css-languageservice';
+import { ICompletionParticipant, URILiteralCompletionContext } from 'vscode-css-languageservice';
 
 import { startsWith } from './utils/strings';
 
@@ -20,7 +20,7 @@ export function getPathCompletionParticipant(
 	result: CompletionList
 ): ICompletionParticipant {
 	return {
-		onURILiteralValue: (context: { uriValue: string, position: Position, range: Range; }) => {
+		onURILiteralValue: (context: URILiteralCompletionContext) => {
 			if (!workspaceFolders || workspaceFolders.length === 0) {
 				return;
 			}
@@ -91,7 +91,11 @@ export function providePathSuggestions(value: string, range: Range, activeDocFsP
 }
 
 const isDir = (p: string) => {
-	return fs.statSync(p).isDirectory();
+	try {
+		return fs.statSync(p).isDirectory();
+	} catch (e) {
+		return false;
+	}
 };
 
 function resolveWorkspaceRoot(activeDoc: TextDocument, workspaceFolders: WorkspaceFolder[]): string | undefined {
diff --git a/extensions/css-language-features/server/src/test/completion.test.ts b/extensions/css-language-features/server/src/test/completion.test.ts
index 518a467cf40..82f1af7026d 100644
--- a/extensions/css-language-features/server/src/test/completion.test.ts
+++ b/extensions/css-language-features/server/src/test/completion.test.ts
@@ -77,5 +77,19 @@ suite('Completions', () => {
 				{ label: 'src/', resultText: `html { background-image: url('../src/')` }
 			]
 		}, testUri);
+
+		assertCompletions(`html { background-image: url('../src/a|')`, {
+			items: [
+				{ label: 'feature.js', resultText: `html { background-image: url('../src/feature.js')` },
+				{ label: 'data/', resultText: `html { background-image: url('../src/data/')` },
+				{ label: 'test.js', resultText: `html { background-image: url('../src/test.js')` }
+			]
+		}, testUri);
+
+		assertCompletions(`html { background-image: url('../src/data/f|.asar')`, {
+			items: [
+				{ label: 'foo.asar', resultText: `html { background-image: url('../src/data/foo.asar')` }
+			]
+		}, testUri);
 	});
 });
\ No newline at end of file
diff --git a/extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar b/extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar
new file mode 100644
index 00000000000..adae63e647c
--- /dev/null
+++ b/extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
\ No newline at end of file
diff --git a/extensions/html-language-features/server/src/modes/pathCompletion.ts b/extensions/html-language-features/server/src/modes/pathCompletion.ts
index afb5089fbfd..10e4649a0e3 100644
--- a/extensions/html-language-features/server/src/modes/pathCompletion.ts
+++ b/extensions/html-language-features/server/src/modes/pathCompletion.ts
@@ -82,7 +82,7 @@ function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?:
 
 	try {
 		return fs.readdirSync(parentDir).map(f => {
-			return fs.statSync(path.resolve(parentDir, f)).isDirectory()
+			return isDir(path.resolve(parentDir, f))
 				? f + '/'
 				: f;
 		});
@@ -91,6 +91,14 @@ function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?:
 	}
 }
 
+function isDir(p: string) {
+	try {
+		return fs.statSync(p).isDirectory();
+	} catch (e) {
+		return false;
+	}
+}
+
 function pathToSuggestion(p: string, valueBeforeCursor: string, fullValue: string, range: Range): CompletionItem {
 	const isDir = p[p.length - 1] === '/';
 

From dcc822dac11fa3fe3720739bfff703e6c15ad5fc Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 22:20:22 +0200
Subject: [PATCH 181/383] Store the first visible line in the view state
 (#41968)

---
 .../editor/browser/widget/codeEditorWidget.ts |  8 ++--
 src/vs/editor/common/commonCodeEditor.ts      |  2 +-
 src/vs/editor/common/editorCommon.ts          |  8 +++-
 src/vs/editor/common/viewLayout/viewLayout.ts | 13 +------
 src/vs/editor/common/viewModel/viewModel.ts   |  5 +--
 .../editor/common/viewModel/viewModelImpl.ts  | 37 +++++++++++++++++++
 src/vs/monaco.d.ts                            |  8 +++-
 7 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
index 8c517a711d6..a46cc954011 100644
--- a/src/vs/editor/browser/widget/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -455,11 +455,11 @@ export abstract class CodeEditorWidget extends CommonCodeEditor implements edito
 			return;
 		}
 		if (s && s.cursorState && s.viewState) {
-			const reducedState = this.viewModel.viewLayout.reduceRestoreState(s.viewState);
+			const reducedState = this.viewModel.reduceRestoreState(s.viewState);
 			const linesViewportData = this.viewModel.viewLayout.getLinesViewportDataAtScrollTop(reducedState.scrollTop);
-			const startViewPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.startLineNumber, 1));
-			const endViewPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.endLineNumber, 1));
-			this.model.tokenizeViewport(startViewPosition.lineNumber, endViewPosition.lineNumber);
+			const startPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.startLineNumber, 1));
+			const endPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.endLineNumber, 1));
+			this.model.tokenizeViewport(startPosition.lineNumber, endPosition.lineNumber);
 			this._view.restoreState(reducedState);
 		}
 	}
diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts
index 91af610e886..b9c9ca1a3c9 100644
--- a/src/vs/editor/common/commonCodeEditor.ts
+++ b/src/vs/editor/common/commonCodeEditor.ts
@@ -641,7 +641,7 @@ export abstract class CommonCodeEditor extends Disposable {
 		}
 
 		const cursorState = this.cursor.saveState();
-		const viewState = this.viewModel.viewLayout.saveState();
+		const viewState = this.viewModel.saveState();
 		return {
 			cursorState: cursorState,
 			viewState: viewState,
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
index 44106c97324..5ad6a70a0f6 100644
--- a/src/vs/editor/common/editorCommon.ts
+++ b/src/vs/editor/common/editorCommon.ts
@@ -199,9 +199,13 @@ export interface ICursorState {
  * A (serializable) state of the view.
  */
 export interface IViewState {
-	scrollTop: number;
-	scrollTopWithoutViewZones: number;
+	/** written by previous versions */
+	scrollTop?: number;
+	/** written by previous versions */
+	scrollTopWithoutViewZones?: number;
 	scrollLeft: number;
+	firstPosition: IPosition;
+	firstPositionDeltaTop: number;
 }
 /**
  * A (serializable) state of the code editor.
diff --git a/src/vs/editor/common/viewLayout/viewLayout.ts b/src/vs/editor/common/viewLayout/viewLayout.ts
index d04c5657afb..a7e1f091386 100644
--- a/src/vs/editor/common/viewLayout/viewLayout.ts
+++ b/src/vs/editor/common/viewLayout/viewLayout.ts
@@ -163,7 +163,7 @@ export class ViewLayout extends Disposable implements IViewLayout {
 
 	// ---- view state
 
-	public saveState(): editorCommon.IViewState {
+	public saveState(): { scrollTop: number; scrollTopWithoutViewZones: number; scrollLeft: number; } {
 		const currentScrollPosition = this.scrollable.getFutureScrollPosition();
 		let scrollTop = currentScrollPosition.scrollTop;
 		let firstLineNumberInViewport = this._linesLayout.getLineNumberAtOrAfterVerticalOffset(scrollTop);
@@ -175,17 +175,6 @@ export class ViewLayout extends Disposable implements IViewLayout {
 		};
 	}
 
-	public reduceRestoreState(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {
-		let restoreScrollTop = state.scrollTop;
-		if (typeof state.scrollTopWithoutViewZones === 'number' && !this._linesLayout.hasWhitespace()) {
-			restoreScrollTop = state.scrollTopWithoutViewZones;
-		}
-		return {
-			scrollLeft: state.scrollLeft,
-			scrollTop: restoreScrollTop
-		};
-	}
-
 	// ---- IVerticalLayoutProvider
 
 	public addWhitespace(afterLineNumber: number, ordinal: number, height: number): number {
diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts
index 3dc65ee071a..12766993b5d 100644
--- a/src/vs/editor/common/viewModel/viewModel.ts
+++ b/src/vs/editor/common/viewModel/viewModel.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { INewScrollPosition, IViewState } from 'vs/editor/common/editorCommon';
+import { INewScrollPosition } from 'vs/editor/common/editorCommon';
 import { EndOfLinePreference, IModelDecorationOptions } from 'vs/editor/common/model';
 import { IViewLineTokens } from 'vs/editor/common/core/lineTokens';
 import { Position, IPosition } from 'vs/editor/common/core/position';
@@ -63,9 +63,6 @@ export interface IViewLayout {
 	getLinesViewportDataAtScrollTop(scrollTop: number): IPartialViewLinesViewportData;
 	getWhitespaces(): IEditorWhitespace[];
 
-	saveState(): IViewState;
-	reduceRestoreState(state: IViewState): { scrollLeft: number; scrollTop: number; };
-
 	isAfterLines(verticalOffset: number): boolean;
 	getLineNumberAtVerticalOffset(verticalOffset: number): number;
 	getVerticalOffsetForLineNumber(lineNumber: number): number;
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 6f9f27e704e..e857d492b4c 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -409,6 +409,43 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		);
 	}
 
+	public saveState(): editorCommon.IViewState {
+		const compatViewState = this.viewLayout.saveState();
+
+		const scrollTop = compatViewState.scrollTop;
+		const firstViewLineNumber = this.viewLayout.getLineNumberAtVerticalOffset(scrollTop);
+		const firstPosition = this.coordinatesConverter.convertViewPositionToModelPosition(new Position(firstViewLineNumber, this.getLineMinColumn(firstViewLineNumber)));
+		const firstPositionDeltaTop = this.viewLayout.getVerticalOffsetForLineNumber(firstViewLineNumber) - scrollTop;
+
+		return {
+			scrollLeft: compatViewState.scrollLeft,
+			firstPosition: firstPosition,
+			firstPositionDeltaTop: firstPositionDeltaTop
+		};
+	}
+
+	public reduceRestoreState(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {
+		if (typeof state.firstPosition === 'undefined') {
+			// This is a view state serialized by an older version
+			return this._reduceRestoreStateCompatibility(state);
+		}
+
+		const modelPosition = this.model.validatePosition(state.firstPosition);
+		const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(modelPosition);
+		const scrollTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber) - state.firstPositionDeltaTop;
+		return {
+			scrollLeft: state.scrollLeft,
+			scrollTop: scrollTop
+		};
+	}
+
+	private _reduceRestoreStateCompatibility(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {
+		return {
+			scrollLeft: state.scrollLeft,
+			scrollTop: state.scrollTopWithoutViewZones
+		};
+	}
+
 	public getTabSize(): number {
 		return this.model.getOptions().tabSize;
 	}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index dd91585c691..700626d549a 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -1927,9 +1927,13 @@ declare namespace monaco.editor {
 	 * A (serializable) state of the view.
 	 */
 	export interface IViewState {
-		scrollTop: number;
-		scrollTopWithoutViewZones: number;
+		/** written by previous versions */
+		scrollTop?: number;
+		/** written by previous versions */
+		scrollTopWithoutViewZones?: number;
 		scrollLeft: number;
+		firstPosition: IPosition;
+		firstPositionDeltaTop: number;
 	}
 
 	/**

From 4b55e2d7de5b8feafe913b20d7f2844b28acc8dc Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 28 Mar 2018 23:08:29 +0200
Subject: [PATCH 182/383] [css] update service

---
 extensions/css-language-features/server/package.json | 2 +-
 extensions/css-language-features/server/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 88ed441a3ed..25d1ffe0c96 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -8,7 +8,7 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.3",
+    "vscode-css-languageservice": "^3.0.9-next.4",
     "vscode-emmet-helper": "^1.2.4",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1"
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index 8ce04e915c9..5b970d64c4b 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -18,9 +18,9 @@ jsonc-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
 
-vscode-css-languageservice@^3.0.9-next.3:
-  version "3.0.9-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.3.tgz#c6b8baf316d3b87d5896d2694721d6b90ce41c00"
+vscode-css-languageservice@^3.0.9-next.4:
+  version "3.0.9-next.4"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.4.tgz#d50d4186f70b0dcedf37337b99e71d1ffdc22684"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"

From b2f572cf0f5325da6d52413db12d03474b2e0ce0 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 28 Mar 2018 23:28:48 +0200
Subject: [PATCH 183/383] Fixes #45996: Edit only the indentation part of a
 line

---
 .../editor/contrib/indentation/indentation.ts | 25 +++++++++++++------
 .../indentation/test/indentation.test.ts      | 20 ++++++++++++---
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/vs/editor/contrib/indentation/indentation.ts b/src/vs/editor/contrib/indentation/indentation.ts
index 859db38bb06..3ca805ebfad 100644
--- a/src/vs/editor/contrib/indentation/indentation.ts
+++ b/src/vs/editor/contrib/indentation/indentation.ts
@@ -586,18 +586,27 @@ function getIndentationEditOperations(model: ITextModel, builder: IEditOperation
 		spaces += ' ';
 	}
 
-	const content = model.getLinesContent();
-	for (let i = 0; i < content.length; i++) {
-		let lastIndentationColumn = model.getLineFirstNonWhitespaceColumn(i + 1);
+	let spacesRegExp = new RegExp(spaces, 'gi');
+
+	for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber <= lineCount; lineNumber++) {
+		let lastIndentationColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
 		if (lastIndentationColumn === 0) {
-			lastIndentationColumn = model.getLineMaxColumn(i + 1);
+			lastIndentationColumn = model.getLineMaxColumn(lineNumber);
 		}
 
-		const text = (tabsToSpaces ? content[i].substr(0, lastIndentationColumn).replace(/\t/ig, spaces) :
-			content[i].substr(0, lastIndentationColumn).replace(new RegExp(spaces, 'gi'), '\t')) +
-			content[i].substr(lastIndentationColumn);
+		if (lastIndentationColumn === 1) {
+			continue;
+		}
 
-		builder.addEditOperation(new Range(i + 1, 1, i + 1, model.getLineMaxColumn(i + 1)), text);
+		const originalIndentationRange = new Range(lineNumber, 1, lineNumber, lastIndentationColumn);
+		const originalIndentation = model.getValueInRange(originalIndentationRange);
+		const newIndentation = (
+			tabsToSpaces
+				? originalIndentation.replace(/\t/ig, spaces)
+				: originalIndentation.replace(spacesRegExp, '\t')
+		);
+
+		builder.addEditOperation(originalIndentationRange, newIndentation);
 	}
 }
 
diff --git a/src/vs/editor/contrib/indentation/test/indentation.test.ts b/src/vs/editor/contrib/indentation/test/indentation.test.ts
index 1f2e9ff1577..59ece7d34e7 100644
--- a/src/vs/editor/contrib/indentation/test/indentation.test.ts
+++ b/src/vs/editor/contrib/indentation/test/indentation.test.ts
@@ -57,7 +57,7 @@ suite('Editor Contrib - Indentation to Spaces', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 1, 5)
+			new Selection(1, 9, 1, 9)
 		);
 	});
 
@@ -79,7 +79,7 @@ suite('Editor Contrib - Indentation to Spaces', () => {
 				'   fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 1, 5)
+			new Selection(1, 7, 1, 7)
 		);
 	});
 
@@ -157,7 +157,7 @@ suite('Editor Contrib - Indentation to Tabs', () => {
 				'   fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 1, 5),
+			new Selection(1, 8, 1, 8),
 			2,
 			[
 				'\t\t\tfirst   ',
@@ -169,4 +169,18 @@ suite('Editor Contrib - Indentation to Tabs', () => {
 			new Selection(1, 5, 1, 5)
 		);
 	});
+
+	test('issue #45996', function () {
+		testIndentationToSpacesCommand(
+			[
+				'\tabc',
+			],
+			new Selection(1, 3, 1, 3),
+			4,
+			[
+				'    abc',
+			],
+			new Selection(1, 6, 1, 6)
+		);
+	});
 });

From c8d61024f967b3120be8322da6ed9dcb5f624873 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 28 Mar 2018 14:28:33 -0700
Subject: [PATCH 184/383] Change similar issues section to have a max height
 instead of a fixed height, fixes #46124

---
 src/vs/code/electron-browser/issue/media/issueReporter.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index 486ab705a5a..7e7217fe2ba 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -345,7 +345,7 @@ button {
 .issues-container {
 	margin-left: 1.5em;
 	margin-top: .5em;
-	height: 92px;
+	max-height: 92px;
 	overflow-y: auto;
 }
 

From a4da791b92bdfb9f49d9193caf397aa6581ef16d Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 29 Mar 2018 00:03:48 +0200
Subject: [PATCH 185/383] Fixes #45908: Use idiomatic programming

---
 .../browser/preferencesRenderers.ts           | 47 ++++---------------
 1 file changed, 9 insertions(+), 38 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 45f83466767..20e9351d138 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -879,16 +879,12 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 	public render(result: IFilterResult, allSettingsGroups: ISettingsGroup[]): void {
 		const model = this.editor.getModel();
 		this.hiddenAreas = [];
-		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []);
-		});
 		if (result) {
 			this.hiddenAreas = this.computeHiddenRanges(result.filteredGroups, result.allGroups, model);
-			this.editor.changeDecorations(changeAccessor => {
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));
-			});
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));
 		} else {
 			this.hiddenAreas = this.computeHiddenRanges(null, allSettingsGroups, model);
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		}
 	}
 
@@ -920,11 +916,7 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 	}
 
 	public dispose() {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }
@@ -940,14 +932,7 @@ export class HighlightMatchesRenderer extends Disposable {
 
 	public render(matches: IRange[]): void {
 		const model = this.editor.getModel();
-		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []) || [];
-		});
-		if (matches.length) {
-			this.editor.changeDecorations(changeAccessor => {
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model))) || [];
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model)));
 	}
 
 	private static readonly _FIND_MATCH = ModelDecorationOptions.register({
@@ -963,11 +948,7 @@ export class HighlightMatchesRenderer extends Disposable {
 	}
 
 	public dispose() {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			}) || [];
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }
@@ -1383,7 +1364,7 @@ class UnsupportedSettingsRenderer extends Disposable {
 		} else {
 			this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
 		}
-		this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));
 	}
 
 	private createDecoration(range: IRange, model: ITextModel): IModelDeltaDecoration {
@@ -1404,11 +1385,7 @@ class UnsupportedSettingsRenderer extends Disposable {
 
 	public dispose(): void {
 		this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 
@@ -1444,8 +1421,6 @@ class WorkspaceConfigurationRenderer extends Disposable {
 		this.associatedSettingsEditorModel = associatedSettingsEditorModel;
 		// Dim other configurations in workspace configuration file only in the context of Settings Editor
 		if (this.associatedSettingsEditorModel && this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceSettingsEditorModel instanceof WorkspaceConfigurationEditorModel) {
-			this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []));
-
 			const ranges: IRange[] = [];
 			for (const settingsGroup of this.workspaceSettingsEditorModel.configurationGroups) {
 				for (const section of settingsGroup.sections) {
@@ -1461,7 +1436,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 					}
 				}
 			}
-			this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));
 		}
 	}
 
@@ -1478,11 +1453,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 	}
 
 	public dispose(): void {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }

From fe6b1682e4c27faaef5ad3c0c5583c26c3cba234 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Wed, 28 Mar 2018 16:13:26 -0700
Subject: [PATCH 186/383] split long change buffer.

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 89 +++++++++++++++----
 .../pieceTreeTextBuffer.test.ts               | 39 ++++++++
 2 files changed, 113 insertions(+), 15 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 13c81a70acb..b8d8f4f4803 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -13,6 +13,7 @@ import { SearchData, isValidMatch, Searcher, createFindMatch } from 'vs/editor/c
 import { FindMatch } from 'vs/editor/common/model';
 
 // const lfRegex = new RegExp(/\r\n|\r|\n/g);
+export const AverageBufferSize = 65535;
 
 export function createUintArray(arr: number[]): Uint32Array | Uint16Array {
 	let r;
@@ -311,7 +312,7 @@ export class PieceTreeBase {
 	}
 
 	normalizeEOL(eol: '\r\n' | '\n') {
-		let averageBufferSize = 65536;
+		let averageBufferSize = AverageBufferSize;
 		let min = averageBufferSize - Math.floor(averageBufferSize / 3);
 		let max = min * 2;
 
@@ -712,7 +713,8 @@ export class PieceTreeBase {
 			if (node.piece.bufferIndex === 0 &&
 				piece.end.line === this._lastChangeBufferPos.line &&
 				piece.end.column === this._lastChangeBufferPos.column &&
-				(nodeStartOffset + piece.length === offset)
+				(nodeStartOffset + piece.length === offset) &&
+				value.length < AverageBufferSize
 			) {
 				// changed buffer
 				this.appendToNode(node, value);
@@ -769,19 +771,27 @@ export class PieceTreeBase {
 					this.deleteNodeTail(node, insertPosInBuffer);
 				}
 
-				let newPiece = this.createNewPiece(value);
+				let newPieces = this.createNewPieces(value);
 				if (newRightPiece.length > 0) {
 					this.rbInsertRight(node, newRightPiece);
 				}
-				this.rbInsertRight(node, newPiece);
+
+				let tmpNode = node;
+				for (let k = 0; k < newPieces.length; k++) {
+					tmpNode = this.rbInsertRight(tmpNode, newPieces[k]);
+				}
 				this.deleteNodes(nodesToDel);
 			} else {
 				this.insertContentToNodeRight(value, node);
 			}
 		} else {
 			// insert new node
-			let piece = this.createNewPiece(value);
-			this.rbInsertLeft(null, piece);
+			let pieces = this.createNewPieces(value);
+			let node = this.rbInsertLeft(null, pieces[0]);
+
+			for (let k = 1; k < pieces.length; k++) {
+				node = this.rbInsertRight(node, pieces[k]);
+			}
 		}
 
 		// todo, this is too brutal. Total line feed count should be updated the same way as lf_left.
@@ -887,8 +897,11 @@ export class PieceTreeBase {
 			}
 		}
 
-		let newPiece = this.createNewPiece(value);
-		let newNode = this.rbInsertLeft(node, newPiece);
+		let newPieces = this.createNewPieces(value);
+		let newNode = this.rbInsertLeft(node, newPieces[newPieces.length - 1]);
+		for (let k = newPieces.length - 2; k >= 0; k--) {
+			newNode = this.rbInsertLeft(newNode, newPieces[k]);
+		}
 		this.validateCRLFWithPrevNode(newNode);
 		this.deleteNodes(nodesToDel);
 	}
@@ -900,8 +913,14 @@ export class PieceTreeBase {
 			value += '\n';
 		}
 
-		let newPiece = this.createNewPiece(value);
-		let newNode = this.rbInsertRight(node, newPiece);
+		let newPieces = this.createNewPieces(value);
+		let newNode = this.rbInsertRight(node, newPieces[0]);
+		let tmpNode = newNode;
+
+		for (let k = 1; k < newPieces.length; k++) {
+			tmpNode = this.rbInsertRight(tmpNode, newPieces[k]);
+		}
+
 		this.validateCRLFWithPrevNode(newNode);
 	}
 
@@ -994,7 +1013,47 @@ export class PieceTreeBase {
 		}
 	}
 
-	createNewPiece(text: string): Piece {
+	createNewPieces(text: string): Piece[] {
+		if (text.length > AverageBufferSize) {
+			// the content is large, operations like substring, charCode becomes slow
+			// so here we split it into smaller chunks, just like what we did for CR/LF normalization
+			let newPieces = [];
+			while (text.length > AverageBufferSize) {
+				const lastChar = text.charCodeAt(AverageBufferSize - 1);
+				let splitText;
+				if (lastChar === CharCode.CarriageReturn || (lastChar >= 0xd800 && lastChar <= 0xdbff)) {
+					// last character is \r or a high surrogate => keep it back
+					splitText = text.substring(0, AverageBufferSize - 1);
+					text = text.substring(AverageBufferSize - 1);
+				} else {
+					splitText = text.substring(0, AverageBufferSize);
+					text = text.substring(AverageBufferSize);
+				}
+
+				let lineStarts = createLineStartsFast(splitText);
+				newPieces.push(new Piece(
+					this._buffers.length, /* buffer index */
+					{ line: 0, column: 0 },
+					{ line: lineStarts.length - 1, column: splitText.length - lineStarts[lineStarts.length - 1] },
+					lineStarts.length - 1,
+					splitText.length
+				));
+				this._buffers.push(new StringBuffer(splitText, lineStarts));
+			}
+
+			let lineStarts = createLineStartsFast(text);
+			newPieces.push(new Piece(
+				this._buffers.length, /* buffer index */
+				{ line: 0, column: 0 },
+				{ line: lineStarts.length - 1, column: text.length - lineStarts[lineStarts.length - 1] },
+				lineStarts.length - 1,
+				text.length
+			));
+			this._buffers.push(new StringBuffer(text, lineStarts));
+
+			return newPieces;
+		}
+
 		let startOffset = this._buffers[0].buffer.length;
 		const lineStarts = createLineStartsFast(text, false);
 
@@ -1029,14 +1088,14 @@ export class PieceTreeBase {
 		let endColumn = endOffset - this._buffers[0].lineStarts[endIndex];
 		let endPos = { line: endIndex, column: endColumn };
 		let newPiece = new Piece(
-			0,
+			0, /** todo */
 			start,
 			endPos,
 			this.getLineFeedCnt(0, start, endPos),
 			endOffset - startOffset
 		);
 		this._lastChangeBufferPos = endPos;
-		return newPiece;
+		return [newPiece];
 	}
 
 	getLinesRawContent(): string {
@@ -1519,8 +1578,8 @@ export class PieceTreeBase {
 		}
 
 		// create new piece which contains \r\n
-		let piece = this.createNewPiece('\r\n');
-		this.rbInsertRight(prev, piece);
+		let pieces = this.createNewPieces('\r\n');
+		this.rbInsertRight(prev, pieces[0]);
 		// delete empty nodes
 
 		for (let i = 0; i < nodesToDel.length; i++) {
diff --git a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
index e5b6970d888..d4de4b65ec8 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -1445,11 +1445,44 @@ suite('centralized lineStarts with CRLF', () => {
 });
 
 suite('random is unsupervised', () => {
+	test('splitting large change buffer', function () {
+		let pieceTable = createTextBuffer([''], false);
+		let str = '';
+
+		pieceTable.insert(0, 'WUZ\nXVZY\n');
+		str = str.substring(0, 0) + 'WUZ\nXVZY\n' + str.substring(0);
+		pieceTable.insert(8, '\r\r\nZXUWVW');
+		str = str.substring(0, 8) + '\r\r\nZXUWVW' + str.substring(8);
+		pieceTable.delete(10, 7);
+		str = str.substring(0, 10) + str.substring(10 + 7);
+		pieceTable.delete(10, 1);
+		str = str.substring(0, 10) + str.substring(10 + 1);
+		pieceTable.insert(4, 'VX\r\r\nWZVZ');
+		str = str.substring(0, 4) + 'VX\r\r\nWZVZ' + str.substring(4);
+		pieceTable.delete(11, 3);
+		str = str.substring(0, 11) + str.substring(11 + 3);
+		pieceTable.delete(12, 4);
+		str = str.substring(0, 12) + str.substring(12 + 4);
+		pieceTable.delete(8, 0);
+		str = str.substring(0, 8) + str.substring(8 + 0);
+		pieceTable.delete(10, 2);
+		str = str.substring(0, 10) + str.substring(10 + 2);
+		pieceTable.insert(0, 'VZXXZYZX\r');
+		str = str.substring(0, 0) + 'VZXXZYZX\r' + str.substring(0);
+
+		assert.equal(pieceTable.getLinesRawContent(), str);
+
+		testLineStarts(str, pieceTable);
+		testLinesContent(str, pieceTable);
+		assertTreeInvariants(pieceTable);
+	});
+
 	test('random insert delete', function () {
 		this.timeout(500000);
 		let str = '';
 		let pieceTable = createTextBuffer([str], false);
 
+		// let output = '';
 		for (let i = 0; i < 1000; i++) {
 			if (Math.random() < 0.6) {
 				// insert
@@ -1457,6 +1490,8 @@ suite('random is unsupervised', () => {
 				let pos = randomInt(str.length + 1);
 				pieceTable.insert(pos, text);
 				str = str.substring(0, pos) + text + str.substring(pos);
+				// output += `pieceTable.insert(${pos}, '${text.replace(/\n/g, '\\n').replace(/\r/g, '\\r')}');\n`;
+				// output += `str = str.substring(0, ${pos}) + '${text.replace(/\n/g, '\\n').replace(/\r/g, '\\r')}' + str.substring(${pos});\n`;
 			} else {
 				// delete
 				let pos = randomInt(str.length);
@@ -1466,8 +1501,12 @@ suite('random is unsupervised', () => {
 				);
 				pieceTable.delete(pos, length);
 				str = str.substring(0, pos) + str.substring(pos + length);
+				// output += `pieceTable.delete(${pos}, ${length});\n`;
+				// output += `str = str.substring(0, ${pos}) + str.substring(${pos} + ${length});\n`
+
 			}
 		}
+		// console.log(output);
 
 		assert.equal(pieceTable.getLinesRawContent(), str);
 

From 5075e9a2f8f2bf6ff35e4bb77018825d71a50fb3 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 29 Mar 2018 01:27:33 +0200
Subject: [PATCH 187/383] Fixes #45735: Fix implementation of getLineCharCode

---
 .../common/model/pieceTreeTextBuffer/pieceTreeBase.ts    | 2 +-
 .../pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts      | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 13c81a70acb..e5cc6a1b291 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -538,7 +538,7 @@ export class PieceTreeBase {
 		let nodePos = this.nodeAt2(lineNumber, index + 1);
 		let buffer = this._buffers[nodePos.node.piece.bufferIndex];
 		let startOffset = this.offsetInBuffer(nodePos.node.piece.bufferIndex, nodePos.node.piece.start);
-		let targetOffset = startOffset + index;
+		let targetOffset = startOffset + nodePos.remainder;
 
 		return buffer.buffer.charCodeAt(targetOffset);
 	}
diff --git a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
index e5b6970d888..266e9de61ae 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -1571,6 +1571,15 @@ suite('buffer api', () => {
 
 		assert(!a.equal(b));
 	});
+
+	test('getLineCharCode - issue #45735', () => {
+		let pieceTable = createTextBuffer(['LINE1\nline2']);
+		assert.equal(pieceTable.getLineCharCode(2, 0), 'l'.charCodeAt(0), 'l');
+		assert.equal(pieceTable.getLineCharCode(2, 1), 'i'.charCodeAt(0), 'i');
+		assert.equal(pieceTable.getLineCharCode(2, 2), 'n'.charCodeAt(0), 'n');
+		assert.equal(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
+		assert.equal(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
+	});
 });
 
 suite('search offset cache', () => {

From 5126026376982265f1cf7f9d90e20283fef6c595 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Wed, 28 Mar 2018 16:46:15 -0700
Subject: [PATCH 188/383] Revert "Fix microsoft/monaco-editor#552. It's okay to
 switch focus in composition mode when typing Japanese.

This reverts commit 2b941e427c38ee786e7ced495afd7c5dc5538eb3.
---
 src/vs/editor/browser/controller/textAreaInput.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/textAreaInput.ts
index 054dbaa48e4..a96c80dbbf2 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/textAreaInput.ts
@@ -419,12 +419,6 @@ export class TextAreaInput extends Disposable {
 		}
 		this._hasFocus = newHasFocus;
 
-		if (this._isDoingComposition) {
-			// textarea gets focus, so the state should be clean
-			// https://github.com/Microsoft/monaco-editor/issues/552
-			this._isDoingComposition = false;
-		}
-
 		if (this._hasFocus) {
 			if (browser.isEdge) {
 				// Edge has a bug where setting the selection range while the focus event

From 2de91fdce59536e5dffc94d535d7748f3074b127 Mon Sep 17 00:00:00 2001
From: Ramya Rao <ramya.rao.a@outlook.com>
Date: Wed, 28 Mar 2018 18:12:07 -0700
Subject: [PATCH 189/383] Css partial parse refactoring (#46894)

* Refactor parsePartialStylesheet

* More refactoring

* To avoid errors, parse line comments char by char and no when getting to previous line.

* Revert "To avoid errors, parse line comments char by char and no when getting to previous line."

This reverts commit f353dba4c7b7b9224ae02e458b8dafa27654f166.

* Fix for inline comments inside block comments
---
 extensions/emmet/src/util.ts | 182 ++++++++++++++++++-----------------
 1 file changed, 92 insertions(+), 90 deletions(-)

diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index 0fb4471eda5..309be6de79a 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -128,31 +128,53 @@ export function parseDocument(document: vscode.TextDocument, showError: boolean
 	return undefined;
 }
 
-export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Stylesheet | undefined {
+const closeBrace = 125;
+const openBrace = 123;
+const slash = 47;
+const star = 42;
 
+export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Stylesheet | undefined {
+	const isCSS = document.languageId === 'css';
 	let startPosition = new vscode.Position(0, 0);
 	let endPosition = new vscode.Position(document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length);
-	const closeBrace = 125;
-	const openBrace = 123;
-	let slash = 47;
-	let star = 42;
-	let isCSS = document.languageId === 'css';
+	const limitCharacter = document.offsetAt(position) - 5000;
+	const limitPosition = limitCharacter > 0 ? document.positionAt(limitCharacter) : startPosition;
+	const stream = new DocumentStreamReader(document, position);
 
-	let singleLineCommentIndex = document.lineAt(position.line).text.indexOf('//');
-	if (!isCSS && singleLineCommentIndex > -1 && singleLineCommentIndex < position.character) {
-		return;
+	function consumeLineCommentBackwards() {
+		if (!isCSS && currentLine !== stream.pos.line) {
+			currentLine = stream.pos.line;
+			let startLineComment = document.lineAt(currentLine).text.indexOf('//');
+			if (startLineComment > -1) {
+				stream.pos = new vscode.Position(currentLine, startLineComment);
+			}
+		}
 	}
 
-	// Go forward until we found a closing brace.
-	let stream = new DocumentStreamReader(document, position);
-	while (!stream.eof() && !stream.eat(closeBrace)) {
+	function consumeBlockCommentBackwards() {
+		if (stream.peek() === slash) {
+			if (stream.backUp(1) === star) {
+				stream.pos = findOpeningCommentBeforePosition(document, stream.pos) || startPosition;
+			} else {
+				stream.next();
+			}
+		}
+	}
+
+	function consumeCommentForwards() {
 		if (stream.eat(slash)) {
 			if (stream.eat(slash) && !isCSS) {
-				// Single line Comment, we continue searching from next line.
 				stream.pos = new vscode.Position(stream.pos.line + 1, 0);
 			} else if (stream.eat(star)) {
 				stream.pos = findClosingCommentAfterPosition(document, stream.pos) || endPosition;
 			}
+		}
+	}
+
+	// Go forward until we find a closing brace.
+	while (!stream.eof() && !stream.eat(closeBrace)) {
+		if (stream.peek() === slash) {
+			consumeCommentForwards();
 		} else {
 			stream.next();
 		}
@@ -162,99 +184,79 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 		endPosition = stream.pos;
 	}
 
-	// Go back until we found an opening brace. If we find a closing one, we first find its opening brace and then we continue.
 	stream.pos = position;
-	let openBracesRemaining = 1;
+	let openBracesToFind = 1;
 	let currentLine = position.line;
-	let limitCharacter = document.offsetAt(position) - 5000;
-	let limitPosition = limitCharacter > 0 ? document.positionAt(limitCharacter) : startPosition;
+	let exit = false;
 
-	while (openBracesRemaining > 0 && !stream.sof()) {
-		if (position.line - stream.pos.line > 100 || stream.pos.isBeforeOrEqual(limitPosition)) {
-			return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
-		} else if (!isCSS && stream.pos.line !== currentLine) {
-			// In not CSS stylesheets, we need to skip singleLine comments.
-			currentLine = stream.pos.line;
-			let startLineComment = document.lineAt(currentLine).text.indexOf('//');
-			if (startLineComment > -1) {
-				stream.pos = new vscode.Position(currentLine, startLineComment);
-			}
+	// Go back until we found an opening brace. If we find a closing one, consume its pair and continue.
+	while (!exit && openBracesToFind > 0 && !stream.sof()) {
+		consumeLineCommentBackwards();
+
+		switch (stream.backUp(1)) {
+			case openBrace:
+				openBracesToFind--;
+				break;
+			case closeBrace:
+				if (isCSS) {
+					stream.next();
+					startPosition = stream.pos;
+					exit = true;
+				} else {
+					openBracesToFind++;
+				}
+				break;
+			case slash:
+				consumeBlockCommentBackwards();
+				break;
+			default:
+				break;
 		}
-		let ch = stream.backUp(1);
-		if (ch === openBrace) {
-			openBracesRemaining--;
-		} else if (ch === closeBrace) {
-			if (isCSS) {
-				stream.next();
-				return parseStylesheet(new DocumentStreamReader(document, stream.pos, new vscode.Range(stream.pos, endPosition)));
-			}
-			openBracesRemaining++;
-		} else if (ch === slash) {
-			stream.backUp(1);
-			if (stream.peek() === star) {
-				stream.pos = findOpeningCommentBeforePosition(document, stream.pos) || startPosition;
-			} else {
-				stream.next();
-			}
-		} else if (ch === star) {
-			stream.backUp(1);
-			if (stream.peek() === slash) {
-				return;
-			} else {
-				stream.next();
-			}
+
+		if (position.line - stream.pos.line > 100 || stream.pos.isBeforeOrEqual(limitPosition)) {
+			exit = true;
 		}
 	}
 
 	// We are at an opening brace. We need to include its selector.
-	// We need one non whitespace character, that's not commented and is not a block { }
 	currentLine = stream.pos.line;
-	openBracesRemaining = 0;
-	while (!stream.sof()) {
-		// Find a nonspace character
-		while (!stream.sof() && String.fromCharCode(stream.backUp(1)).match(/\s/)) { }
-		if (stream.sof()) {
-			break;
-		}
-		let characterFound = stream.peek();
-		// Check if such character is end of comment.
-		if (characterFound === slash) {
-			let ch = stream.backUp(1);
-			if (ch === star) {
-				stream.pos = findOpeningCommentBeforePosition(document, stream.pos) || startPosition;
-			} else {
-				stream.next();
-			}
+	openBracesToFind = 0;
+	let foundSelector = false;
+	while (!exit && !stream.sof() && !foundSelector && openBracesToFind >= 0) {
+
+		consumeLineCommentBackwards();
+
+		const ch = stream.backUp(1);
+		if (/\s/.test(String.fromCharCode(ch))) {
 			continue;
 		}
-		// In not CSS stylesheets, we need to skip singleLine comments.
-		if (!isCSS && stream.pos.line !== currentLine) {
-			currentLine = stream.pos.line;
-			let startLineComment = document.lineAt(currentLine).text.indexOf('//');
-			if (startLineComment > -1 && startLineComment < stream.pos.character) {
-				stream.pos = new vscode.Position(currentLine, startLineComment);
-				continue;
-			}
-		}
-		// Here, we know we are not in a comment
-		if (characterFound === closeBrace) {
-			openBracesRemaining++;
-		} else if (!openBracesRemaining) {
-			if (characterFound === openBrace) {
-				return;
-			} else {
+
+		switch (ch) {
+			case slash:
+				consumeBlockCommentBackwards();
 				break;
-			}
-		} else if (characterFound === openBrace) {
-			openBracesRemaining--;
+			case closeBrace:
+				openBracesToFind++;
+				break;
+			case openBrace:
+				openBracesToFind--;
+				break;
+			default:
+				if (!openBracesToFind) {
+					foundSelector = true;
+				}
+				break;
+		}
+
+		if (!stream.sof() && foundSelector) {
+			startPosition = stream.pos;
 		}
 	}
-	if (!stream.sof()) {
-		startPosition = stream.pos;
-	}
+
 	try {
 		return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
 	} catch (e) {
+
 	}
 }
 
@@ -482,7 +484,7 @@ export function getEmmetConfiguration(syntax: string) {
 }
 
 /**
- * Itereates by each child, as well as nested child’ children, in their order
+ * Itereates by each child, as well as nested child's children, in their order
  * and invokes `fn` for each. If `fn` function returns `false`, iteration stops
  */
 export function iterateCSSToken(token: CssToken, fn: (x: any) => any) {

From 5e51bf9fd8adbe8e6b8da15d8b6056d81b15938f Mon Sep 17 00:00:00 2001
From: Daniel Ye <danyeh@microsoft.com>
Date: Wed, 28 Mar 2018 18:20:16 -0700
Subject: [PATCH 190/383] 2018-03-28. Merged in translations from Transifex.

---
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/chs/extensions/css/package.i18n.json     | 74 +----------------
 i18n/chs/extensions/emmet/package.i18n.json   |  3 +-
 .../chs/extensions/git/out/commands.i18n.json |  2 +-
 i18n/chs/extensions/git/out/main.i18n.json    |  4 +-
 i18n/chs/extensions/git/package.i18n.json     |  5 +-
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/chs/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/chs/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 18 +++++
 i18n/chs/extensions/php/package.i18n.json     |  9 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../config/commonEditorConfig.i18n.json       |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  4 +-
 .../editor/contrib/find/findWidget.i18n.json  |  2 +-
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        | 47 +++++++++++
 .../wordHighlighter/wordHighlighter.i18n.json |  4 +-
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  6 +-
 .../list/browser/listService.i18n.json        |  5 +-
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../mainThreadSaveParticipant.i18n.json       |  2 +
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        | 10 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../notificationsCenter.i18n.json             |  1 +
 .../main.contribution.i18n.json               | 12 ++-
 .../debug/browser/breakpointsView.i18n.json   |  1 +
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../browser/debugEditorActions.i18n.json      |  1 +
 .../debug/browser/linkDetector.i18n.json      |  4 +-
 .../breakpointWidget.i18n.json                | 18 +++++
 .../debugEditorContribution.i18n.json         |  5 ++
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../parts/debug/node/debugAdapter.i18n.json   |  1 +
 .../browser/extensionsActions.i18n.json       |  3 +
 .../extensionEditor.i18n.json                 | 61 ++++++++++++++
 .../extensionTipsService.i18n.json            |  2 +-
 .../extensionsViewlet.i18n.json               |  4 +-
 .../browser/editors/textFileEditor.i18n.json  |  2 +
 .../fileActions.contribution.i18n.json        |  2 +-
 .../electron-browser/fileActions.i18n.json    |  6 +-
 .../files.contribution.i18n.json              |  2 +
 .../views/explorerViewer.i18n.json            |  2 +
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  4 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 44 ++++++++++
 .../output/browser/outputActions.i18n.json    |  3 +-
 .../output.contribution.i18n.json             |  3 +-
 .../browser/keybindingsEditor.i18n.json       |  2 +
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  7 +-
 .../tasks/common/problemMatcher.i18n.json     |  1 +
 .../electron-browser/jsonSchema_v2.i18n.json  |  9 +++
 .../task.contribution.i18n.json               |  8 +-
 .../tasks/node/taskConfiguration.i18n.json    |  2 +-
 .../terminalActions.i18n.json                 |  6 +-
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 12 +++
 .../configurationResolverService.i18n.json    | 21 +++++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  2 +-
 .../services/files/node/fileService.i18n.json |  2 +-
 .../browser/progressService2.i18n.json        |  3 +-
 .../electron-browser/TMGrammars.i18n.json     |  1 +
 .../electron-browser/TMSyntax.i18n.json       |  1 +
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/cht/extensions/css/package.i18n.json     | 74 +----------------
 i18n/cht/extensions/emmet/package.i18n.json   |  3 +-
 .../cht/extensions/git/out/commands.i18n.json |  2 +-
 i18n/cht/extensions/git/package.i18n.json     |  1 +
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/cht/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/cht/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 18 +++++
 i18n/cht/extensions/php/package.i18n.json     | 10 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  1 -
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        | 40 +++++++++
 .../wordHighlighter/wordHighlighter.i18n.json |  2 -
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  5 +-
 .../list/browser/listService.i18n.json        |  3 +-
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        | 10 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../notificationsCenter.i18n.json             |  1 +
 .../main.contribution.i18n.json               |  5 +-
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../browser/extensionsActions.i18n.json       |  1 +
 .../extensionEditor.i18n.json                 | 61 ++++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 +-
 .../views/explorerViewer.i18n.json            |  1 +
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../browser/keybindingsEditor.i18n.json       |  2 +
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  7 +-
 .../electron-browser/jsonSchema_v2.i18n.json  |  6 ++
 .../task.contribution.i18n.json               |  8 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    | 18 +++++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  2 +-
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 80 ++++++++++++++++++
 i18n/deu/extensions/css/package.i18n.json     | 73 +----------------
 .../deu/extensions/git/out/commands.i18n.json |  1 -
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/deu/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/deu/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 10 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 31 +++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 17 ++++
 i18n/deu/extensions/php/package.i18n.json     | 10 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  1 -
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        |  9 +++
 .../wordHighlighter/wordHighlighter.i18n.json |  2 -
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  4 +-
 .../list/browser/listService.i18n.json        |  3 +-
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        |  9 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../main.contribution.i18n.json               |  3 -
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../browser/extensionsActions.i18n.json       |  2 +
 .../extensionEditor.i18n.json                 | 56 +++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 -
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 10 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 11 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  4 -
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  7 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    |  9 +++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  1 -
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 79 ++++++++++++++++++
 i18n/esn/extensions/css/package.i18n.json     | 73 +----------------
 .../esn/extensions/git/out/commands.i18n.json |  1 -
 i18n/esn/extensions/git/package.i18n.json     |  1 +
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/esn/extensions/html/package.i18n.json    | 26 +-----
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/esn/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 19 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 16 ++++
 i18n/esn/extensions/php/package.i18n.json     | 10 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  5 +-
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        | 12 +++
 .../wordHighlighter/wordHighlighter.i18n.json |  2 -
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  3 -
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../api/browser/viewsExtensionPoint.i18n.json |  2 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        |  9 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../main.contribution.i18n.json               |  3 -
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  3 +-
 .../extensionEditor.i18n.json                 | 56 +++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 -
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  4 -
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  7 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    | 18 +++++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  2 +-
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/fra/extensions/css/package.i18n.json     | 74 +----------------
 i18n/fra/extensions/emmet/package.i18n.json   |  3 +-
 .../fra/extensions/git/out/commands.i18n.json |  1 -
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/fra/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/fra/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 17 ++++
 i18n/fra/extensions/php/package.i18n.json     | 10 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  2 +-
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        | 20 +++++
 .../wordHighlighter/wordHighlighter.i18n.json |  4 +-
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  6 +-
 .../list/browser/listService.i18n.json        |  3 +-
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        | 10 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../main.contribution.i18n.json               |  6 +-
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  3 +-
 .../extensionEditor.i18n.json                 | 55 +++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 -
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 10 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 12 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  4 -
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  7 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    | 21 +++++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  1 -
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/hun/extensions/css/package.i18n.json     | 74 +----------------
 i18n/hun/extensions/emmet/package.i18n.json   |  3 +-
 .../hun/extensions/git/out/commands.i18n.json |  2 +-
 i18n/hun/extensions/git/package.i18n.json     |  1 +
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/hun/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/hun/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 18 +++++
 i18n/hun/extensions/php/package.i18n.json     |  9 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  4 +-
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        | 47 +++++++++++
 .../wordHighlighter/wordHighlighter.i18n.json |  4 +-
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  6 +-
 .../list/browser/listService.i18n.json        |  3 +-
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../mainThreadSaveParticipant.i18n.json       |  2 +
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        | 10 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../notificationsCenter.i18n.json             |  1 +
 .../main.contribution.i18n.json               | 12 ++-
 .../debug/browser/breakpointsView.i18n.json   |  1 +
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../browser/debugEditorActions.i18n.json      |  1 +
 .../breakpointWidget.i18n.json                | 18 +++++
 .../debugEditorContribution.i18n.json         |  5 ++
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../parts/debug/node/debugAdapter.i18n.json   |  1 +
 .../browser/extensionsActions.i18n.json       |  3 +
 .../extensionEditor.i18n.json                 | 61 ++++++++++++++
 .../extensionTipsService.i18n.json            |  2 +-
 .../extensionsViewlet.i18n.json               |  4 +-
 .../browser/editors/textFileEditor.i18n.json  |  2 +
 .../electron-browser/fileActions.i18n.json    |  6 +-
 .../files.contribution.i18n.json              |  2 +
 .../views/explorerViewer.i18n.json            |  2 +
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  4 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 44 ++++++++++
 .../output/browser/outputActions.i18n.json    |  3 +-
 .../output.contribution.i18n.json             |  3 +-
 .../browser/keybindingsEditor.i18n.json       |  2 +
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  7 +-
 .../tasks/common/problemMatcher.i18n.json     |  1 +
 .../electron-browser/jsonSchema_v2.i18n.json  |  9 +++
 .../task.contribution.i18n.json               |  8 +-
 .../tasks/node/taskConfiguration.i18n.json    |  2 +-
 .../terminalActions.i18n.json                 |  6 +-
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 12 +++
 .../configurationResolverService.i18n.json    | 21 +++++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  2 +-
 .../services/files/node/fileService.i18n.json |  2 +-
 .../browser/progressService2.i18n.json        |  3 +-
 .../electron-browser/TMGrammars.i18n.json     |  3 +-
 .../electron-browser/TMSyntax.i18n.json       |  1 +
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/ita/extensions/css/package.i18n.json     | 74 +----------------
 .../ita/extensions/git/out/commands.i18n.json |  1 -
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/ita/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 19 +++++
 i18n/ita/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 16 ++++
 i18n/ita/extensions/php/package.i18n.json     | 10 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  1 -
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        |  9 +++
 .../wordHighlighter/wordHighlighter.i18n.json |  2 -
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  3 -
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        |  9 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../main.contribution.i18n.json               |  3 -
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../extensionEditor.i18n.json                 | 57 +++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 -
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 10 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 11 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  4 -
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  7 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    |  9 +++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  1 -
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/jpn/extensions/css/package.i18n.json     | 74 +----------------
 i18n/jpn/extensions/emmet/package.i18n.json   |  3 +-
 .../jpn/extensions/git/out/commands.i18n.json |  2 +-
 i18n/jpn/extensions/git/package.i18n.json     |  3 +-
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/jpn/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/jpn/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 18 +++++
 i18n/jpn/extensions/php/package.i18n.json     |  9 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../src/vs/code/electron-main/menus.i18n.json |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  4 +-
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        | 47 +++++++++++
 .../wordHighlighter/wordHighlighter.i18n.json |  4 +-
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  6 +-
 .../list/browser/listService.i18n.json        |  3 +-
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../mainThreadSaveParticipant.i18n.json       |  2 +
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        | 10 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../notificationsCenter.i18n.json             |  1 +
 .../main.contribution.i18n.json               | 12 ++-
 .../debug/browser/breakpointsView.i18n.json   |  1 +
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../browser/debugEditorActions.i18n.json      |  1 +
 .../breakpointWidget.i18n.json                | 18 +++++
 .../debugEditorContribution.i18n.json         |  5 ++
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../parts/debug/node/debugAdapter.i18n.json   |  1 +
 .../browser/extensionsActions.i18n.json       |  3 +
 .../extensionEditor.i18n.json                 | 61 ++++++++++++++
 .../extensionsViewlet.i18n.json               |  4 +-
 .../browser/editors/textFileEditor.i18n.json  |  2 +
 .../electron-browser/fileActions.i18n.json    | 10 ++-
 .../files.contribution.i18n.json              |  2 +
 .../views/explorerViewer.i18n.json            |  2 +
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  4 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 44 ++++++++++
 .../output/browser/outputActions.i18n.json    |  3 +-
 .../output.contribution.i18n.json             |  3 +-
 .../browser/keybindingsEditor.i18n.json       |  2 +
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  7 +-
 .../tasks/common/problemMatcher.i18n.json     |  1 +
 .../electron-browser/jsonSchema_v2.i18n.json  |  9 +++
 .../task.contribution.i18n.json               |  8 +-
 .../tasks/node/taskConfiguration.i18n.json    |  2 +-
 .../terminalActions.i18n.json                 |  6 +-
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 12 +++
 .../configurationResolverService.i18n.json    | 21 +++++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  2 +-
 .../services/files/node/fileService.i18n.json |  2 +-
 .../browser/progressService2.i18n.json        |  3 +-
 .../electron-browser/TMGrammars.i18n.json     |  1 +
 .../electron-browser/TMSyntax.i18n.json       |  1 +
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/kor/extensions/css/package.i18n.json     | 74 +----------------
 .../kor/extensions/git/out/commands.i18n.json |  1 -
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/kor/extensions/html/package.i18n.json    | 27 +------
 i18n/kor/extensions/jake/package.i18n.json    |  1 +
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 19 +++++
 i18n/kor/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 10 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 30 +++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 18 +++++
 i18n/kor/extensions/php/package.i18n.json     | 10 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  1 -
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        |  9 +++
 .../wordHighlighter/wordHighlighter.i18n.json |  2 -
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  3 -
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        |  9 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../main.contribution.i18n.json               |  3 -
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../extensionEditor.i18n.json                 | 57 +++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  6 +-
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 10 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  4 -
 .../tasks/common/problemMatcher.i18n.json     |  1 +
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  6 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    | 20 +++++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  1 -
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 i18n/ptb/extensions/clojure/package.i18n.json |  3 +-
 .../extensions/coffeescript/package.i18n.json |  3 +-
 .../out/settingsDocumentHelper.i18n.json      |  2 +-
 i18n/ptb/extensions/cpp/package.i18n.json     |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 79 ++++++++++++++++++
 i18n/ptb/extensions/css/package.i18n.json     | 74 +----------------
 .../ptb/extensions/git/out/commands.i18n.json |  1 -
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 32 ++++++++
 i18n/ptb/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/ptb/extensions/json/package.i18n.json    | 14 +---
 .../markdown-basics/package.i18n.json         |  3 +-
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 11 +++
 .../out/security.i18n.json                    | 16 ++++
 .../package.i18n.json                         | 26 ++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 16 ++++
 i18n/ptb/extensions/php/package.i18n.json     |  7 --
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../issue/issueReporterPage.i18n.json         |  4 +
 .../code/electron-main/logUploader.i18n.json  |  1 +
 .../src/vs/code/electron-main/menus.i18n.json |  1 +
 .../common/view/editorColorRegistry.i18n.json |  1 -
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        |  9 +++
 .../wordHighlighter/wordHighlighter.i18n.json |  2 -
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  3 -
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../mainThreadMessageService.i18n.json        |  1 +
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        | 10 +++
 .../editor/editor.contribution.i18n.json      |  1 +
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../notificationsActions.i18n.json            |  4 +-
 .../notificationsStatus.i18n.json             |  3 +-
 .../main.contribution.i18n.json               |  3 -
 .../debug/browser/breakpointsView.i18n.json   |  1 +
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debug.contribution.i18n.json              |  1 +
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../electronDebugActions.i18n.json            |  1 +
 .../extensionEditor.i18n.json                 | 53 ++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 -
 .../views/openEditorsView.i18n.json           |  2 +-
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 10 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 12 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../output/browser/outputActions.i18n.json    |  3 +-
 .../scm/electron-browser/scmViewlet.i18n.json |  1 -
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  5 +-
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  6 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    |  9 +++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  1 -
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 80 ++++++++++++++++++
 i18n/rus/extensions/css/package.i18n.json     | 74 +----------------
 .../rus/extensions/git/out/commands.i18n.json |  1 -
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/rus/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 19 +++++
 i18n/rus/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 10 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 19 +++++
 .../package.i18n.json                         | 31 +++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 16 ++++
 i18n/rus/extensions/php/package.i18n.json     | 10 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  1 -
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        |  9 +++
 .../wordHighlighter/wordHighlighter.i18n.json |  2 -
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  3 -
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        |  9 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../main.contribution.i18n.json               |  3 -
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 15 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../extensionEditor.i18n.json                 | 54 +++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 -
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  4 -
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  7 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    |  9 +++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  1 -
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 .../client/out/cssMain.i18n.json              | 12 +++
 .../css-language-features/package.i18n.json   | 81 +++++++++++++++++++
 i18n/trk/extensions/css/package.i18n.json     | 74 +----------------
 .../trk/extensions/git/out/commands.i18n.json |  1 -
 .../client/out/htmlMain.i18n.json             | 12 +++
 .../html-language-features/package.i18n.json  | 33 ++++++++
 i18n/trk/extensions/html/package.i18n.json    | 27 +------
 .../client/out/jsonMain.i18n.json             | 10 +++
 .../json-language-features/package.i18n.json  | 20 +++++
 i18n/trk/extensions/json/package.i18n.json    | 14 +---
 .../onPreviewStyleLoadError.i18n.json         | 10 +++
 .../out/features/preview.i18n.json            | 11 +++
 .../features/previewContentProvider.i18n.json | 12 +++
 .../out/security.i18n.json                    | 20 +++++
 .../package.i18n.json                         | 32 ++++++++
 .../out/features/validationProvider.i18n.json | 15 ++++
 .../php-language-features/package.i18n.json   | 18 +++++
 i18n/trk/extensions/php/package.i18n.json     |  9 +--
 .../issue/issueReporterMain.i18n.json         |  2 +-
 .../common/view/editorColorRegistry.i18n.json |  4 +-
 .../contrib/gotoError/gotoError.i18n.json     |  7 +-
 .../gotoError/gotoErrorWidget.i18n.json       | 14 ++++
 .../snippet/snippetVariables.i18n.json        | 47 +++++++++++
 .../wordHighlighter/wordHighlighter.i18n.json |  4 +-
 .../platform/dialogs/common/dialogs.i18n.json | 11 +++
 .../dialogs/node/dialogService.i18n.json      | 10 +++
 .../node/extensionManagementService.i18n.json |  4 +-
 .../list/browser/listService.i18n.json        |  3 +-
 .../platform/markers/common/markers.i18n.json | 12 +++
 .../theme/common/colorRegistry.i18n.json      |  4 +-
 .../electron-browser/mainThreadTask.i18n.json | 10 +++
 .../api/node/extHostProgress.i18n.json        | 10 +++
 .../parts/editor/editorActions.i18n.json      |  1 +
 .../parts/editor/titleControl.i18n.json       |  1 -
 .../notificationsCenter.i18n.json             |  1 +
 .../main.contribution.i18n.json               |  3 -
 .../debug/browser/debugActions.i18n.json      |  4 -
 .../breakpointWidget.i18n.json                | 16 ++++
 .../debugEditorContribution.i18n.json         |  4 +
 .../electron-browser/debugService.i18n.json   |  4 +-
 .../parts/debug/node/debugAdapter.i18n.json   |  1 +
 .../browser/extensionsActions.i18n.json       |  4 +-
 .../extensionEditor.i18n.json                 | 61 ++++++++++++++
 .../extensionsViewlet.i18n.json               |  1 -
 .../electron-browser/fileActions.i18n.json    |  4 -
 .../html.contribution.i18n.json               | 10 +++
 .../htmlPreviewPart.i18n.json                 | 10 +++
 .../webview.contribution.i18n.json            | 10 +++
 .../webviewCommands.i18n.json                 | 11 +++
 .../localizations.contribution.i18n.json      |  3 +
 .../markers.contribution.i18n.json            | 11 +++
 .../electron-browser/markers.i18n.json        | 11 +++
 .../markersFileDecorations.i18n.json          | 13 +++
 .../electron-browser/messages.i18n.json       | 34 ++++++++
 .../output.contribution.i18n.json             |  3 +-
 .../search/browser/searchActions.i18n.json    |  2 -
 .../parts/search/browser/searchView.i18n.json |  4 -
 .../electron-browser/jsonSchema_v2.i18n.json  |  2 +
 .../task.contribution.i18n.json               |  8 +-
 .../tasks/node/taskConfiguration.i18n.json    |  1 -
 .../electron-browser/terminalPanel.i18n.json  |  4 +-
 .../releaseNotesEditor.i18n.json              | 11 +++
 .../update/electron-browser/update.i18n.json  |  1 -
 .../webview.contribution.i18n.json            | 10 +++
 .../telemetryOptOut.i18n.json                 | 10 +++
 .../configurationResolverService.i18n.json    |  9 +++
 .../electron-browser/dialogService.i18n.json  | 11 +++
 .../electron-browser/fileService.i18n.json    |  1 -
 .../services/files/node/fileService.i18n.json |  1 -
 .../browser/progressService2.i18n.json        |  3 +-
 883 files changed, 8089 insertions(+), 2047 deletions(-)
 create mode 100644 i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/chs/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/chs/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/chs/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/chs/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/chs/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/chs/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/chs/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/cht/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/cht/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/cht/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/cht/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/cht/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/cht/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/cht/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/deu/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/deu/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/deu/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/deu/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/deu/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/deu/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/deu/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/esn/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/esn/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/esn/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/esn/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/esn/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/esn/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/esn/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/fra/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/fra/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/fra/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/fra/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/fra/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/fra/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/fra/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/hun/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/hun/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/hun/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/hun/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/hun/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/hun/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/hun/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/ita/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/ita/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/ita/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/ita/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/ita/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/ita/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/ita/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/jpn/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/jpn/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/jpn/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/jpn/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/jpn/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/jpn/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/jpn/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/kor/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/kor/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/kor/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/kor/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/kor/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/kor/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/kor/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/ptb/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/ptb/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/ptb/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/ptb/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/ptb/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/ptb/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/ptb/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/rus/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/rus/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/rus/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/rus/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/rus/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/rus/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/rus/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
 create mode 100644 i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json
 create mode 100644 i18n/trk/extensions/css-language-features/package.i18n.json
 create mode 100644 i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json
 create mode 100644 i18n/trk/extensions/html-language-features/package.i18n.json
 create mode 100644 i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json
 create mode 100644 i18n/trk/extensions/json-language-features/package.i18n.json
 create mode 100644 i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
 create mode 100644 i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json
 create mode 100644 i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
 create mode 100644 i18n/trk/extensions/markdown-language-features/out/security.i18n.json
 create mode 100644 i18n/trk/extensions/markdown-language-features/package.i18n.json
 create mode 100644 i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json
 create mode 100644 i18n/trk/extensions/php-language-features/package.i18n.json
 create mode 100644 i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
 create mode 100644 i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
 create mode 100644 i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json
 create mode 100644 i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json
 create mode 100644 i18n/trk/src/vs/platform/markers/common/markers.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
 create mode 100644 i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json

diff --git a/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..bbb5b917ca9
--- /dev/null
+++ b/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "CSS 语言服务器",
+	"folding.start": "折叠区域开始",
+	"folding.end": "折叠区域结束"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css-language-features/package.i18n.json b/i18n/chs/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..e35e92e1f84
--- /dev/null
+++ b/i18n/chs/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "CSS 语言功能",
+	"description": "为 CSS、LESS 和 SCSS 文件提供丰富的语言支持。",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
+	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
+	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
+	"css.lint.duplicateProperties.desc": "不要使用重复的样式定义",
+	"css.lint.emptyRules.desc": "不要使用空规则集",
+	"css.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
+	"css.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
+	"css.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
+	"css.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
+	"css.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
+	"css.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
+	"css.lint.importStatement.desc": "Import 语句不会并行加载",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
+	"css.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
+	"css.lint.unknownProperties.desc": "未知的属性。",
+	"css.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
+	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
+	"css.lint.zeroUnits.desc": "零不需要单位",
+	"css.trace.server.desc": "跟踪 VS Code 与 CSS 语言服务器之间的通信。",
+	"css.validate.title": "控制 CSS 验证和问题严重性。",
+	"css.validate.desc": "启用或禁用所有验证",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
+	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
+	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
+	"less.lint.duplicateProperties.desc": "不要使用重复的样式定义",
+	"less.lint.emptyRules.desc": "不要使用空规则集",
+	"less.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
+	"less.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
+	"less.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
+	"less.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
+	"less.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
+	"less.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
+	"less.lint.importStatement.desc": "Import 语句不会并行加载",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
+	"less.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
+	"less.lint.unknownProperties.desc": "未知的属性。",
+	"less.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
+	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
+	"less.lint.zeroUnits.desc": "零不需要单位",
+	"less.validate.title": "控制 LESS 验证和问题严重性。",
+	"less.validate.desc": "启用或禁用所有验证",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
+	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
+	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
+	"scss.lint.duplicateProperties.desc": "不要使用重复的样式定义",
+	"scss.lint.emptyRules.desc": "不要使用空规则集",
+	"scss.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
+	"scss.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
+	"scss.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
+	"scss.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
+	"scss.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
+	"scss.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
+	"scss.lint.importStatement.desc": "Import 语句不会并行加载",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
+	"scss.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
+	"scss.lint.unknownProperties.desc": "未知的属性。",
+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
+	"scss.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
+	"scss.lint.zeroUnits.desc": "零不需要单位",
+	"scss.validate.title": "控制 SCSS 验证和问题严重性。",
+	"scss.validate.desc": "启用或禁用所有验证",
+	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"css.colorDecorators.enable.deprecationMessage": "已弃用设置 \"css.colorDecorators.enabl\"，请改用 \"editor.colorDecorators\"。",
+	"scss.colorDecorators.enable.deprecationMessage": "已弃用设置 \"scss.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
+	"less.colorDecorators.enable.deprecationMessage": "已弃用设置 \"less.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css/package.i18n.json b/i18n/chs/extensions/css/package.i18n.json
index 7648b17fe69..52369e22e58 100644
--- a/i18n/chs/extensions/css/package.i18n.json
+++ b/i18n/chs/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS 语言功能",
-	"description": "为 CSS、LESS 和 SCSS 文件提供丰富的语言支持。",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"css.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"css.lint.emptyRules.desc": "不要使用空规则集",
-	"css.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"css.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"css.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"css.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"css.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"css.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"css.lint.importStatement.desc": "Import 语句不会并行加载",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"css.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
-	"css.lint.unknownProperties.desc": "未知的属性。",
-	"css.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"css.lint.zeroUnits.desc": "零不需要单位",
-	"css.trace.server.desc": "跟踪 VS Code 与 CSS 语言服务器之间的通信。",
-	"css.validate.title": "控制 CSS 验证和问题严重性。",
-	"css.validate.desc": "启用或禁用所有验证",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"less.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"less.lint.emptyRules.desc": "不要使用空规则集",
-	"less.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"less.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"less.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"less.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"less.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"less.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"less.lint.importStatement.desc": "Import 语句不会并行加载",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"less.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-	"less.lint.unknownProperties.desc": "未知的属性。",
-	"less.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"less.lint.zeroUnits.desc": "零不需要单位",
-	"less.validate.title": "控制 LESS 验证和问题严重性。",
-	"less.validate.desc": "启用或禁用所有验证",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"scss.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"scss.lint.emptyRules.desc": "不要使用空规则集",
-	"scss.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"scss.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"scss.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"scss.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"scss.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"scss.lint.importStatement.desc": "Import 语句不会并行加载",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"scss.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-	"scss.lint.unknownProperties.desc": "未知的属性。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"scss.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"scss.lint.zeroUnits.desc": "零不需要单位",
-	"scss.validate.title": "控制 SCSS 验证和问题严重性。",
-	"scss.validate.desc": "启用或禁用所有验证",
-	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"css.colorDecorators.enable.deprecationMessage": "已弃用设置 \"css.colorDecorators.enabl\"，请改用 \"editor.colorDecorators\"。",
-	"scss.colorDecorators.enable.deprecationMessage": "已弃用设置 \"scss.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
-	"less.colorDecorators.enable.deprecationMessage": "已弃用设置 \"less.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
+	"displayName": "CSS 语言基础功能",
+	"description": "为 CSS、LESS 和 SCSS 文件中提供语法高亮和括号匹配功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/emmet/package.i18n.json b/i18n/chs/extensions/emmet/package.i18n.json
index 091b728c40a..14e1d1d65e4 100644
--- a/i18n/chs/extensions/emmet/package.i18n.json
+++ b/i18n/chs/extensions/emmet/package.i18n.json
@@ -59,5 +59,6 @@
 	"emmetPreferencesCssWebkitProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"webkit\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"webkit\" 前缀，请设为空字符串。",
 	"emmetPreferencesCssMozProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"moz\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"moz\" 前缀，请设为空字符串。",
 	"emmetPreferencesCssOProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"o\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"o\" 前缀，请设为空字符串。",
-	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。"
+	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
+	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/commands.i18n.json b/i18n/chs/extensions/git/out/commands.i18n.json
index 6276a473d55..d4f3c5641f1 100644
--- a/i18n/chs/extensions/git/out/commands.i18n.json
+++ b/i18n/chs/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "确定",
 	"push with tags success": "已成功带标签进行推送。",
 	"pick remote": "选取要将分支“{0}”发布到的远程:",
-	"sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。",
+	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
 	"never again": "确定，且不再显示",
 	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
 	"no changes stash": "没有要储藏的更改。",
diff --git a/i18n/chs/extensions/git/out/main.i18n.json b/i18n/chs/extensions/git/out/main.i18n.json
index 64d8ce0c2ee..3af01415f05 100644
--- a/i18n/chs/extensions/git/out/main.i18n.json
+++ b/i18n/chs/extensions/git/out/main.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"looking": "在 {0} 查找 Git 中",
-	"using git": "使用 {1} 中的 Git {0}",
+	"looking": "正在查找 Git: {0}",
+	"using git": "将使用位于 {1} 的 Git {0}",
 	"downloadgit": "下载 Git",
 	"neverShowAgain": "不再显示",
 	"notfound": "未找到 Git。请安装 Git，或在 \"git.path\" 设置中配置。",
diff --git a/i18n/chs/extensions/git/package.i18n.json b/i18n/chs/extensions/git/package.i18n.json
index b59e2baae07..1ffec732d41 100644
--- a/i18n/chs/extensions/git/package.i18n.json
+++ b/i18n/chs/extensions/git/package.i18n.json
@@ -62,10 +62,10 @@
 	"config.autorefresh": "是否启用自动刷新",
 	"config.autofetch": "是否启用自动拉取",
 	"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
-	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
+	"config.confirmSync": "同步 Git 存储库前进行确认",
 	"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
 	"config.checkoutType": "控制运行“签出到...”功能时列出的分支类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标签，\"remote\" 只显示远程分支。",
-	"config.ignoreLegacyWarning": "忽略旧版 Git 警告",
+	"config.ignoreLegacyWarning": "忽略“旧版 Git”警告",
 	"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
 	"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
 	"config.defaultCloneDirectory": "克隆 Git 存储库的默认位置",
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
 	"config.inputValidation": "控制何时显示提交消息输入验证。",
 	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
+	"config.detectSubmodulesLimit": "控制可检测到的 Git 子模块的限制。",
 	"colors.modified": "已修改资源的颜色。",
 	"colors.deleted": "已删除资源的颜色。",
 	"colors.untracked": "未跟踪资源的颜色。",
diff --git a/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..9df9ff90438
--- /dev/null
+++ b/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "HTML 语言服务器",
+	"folding.start": "折叠区域开始",
+	"folding.end": "折叠区域结束"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html-language-features/package.i18n.json b/i18n/chs/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..10478bc7fed
--- /dev/null
+++ b/i18n/chs/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML 语言功能",
+	"description": "为 HTML、Razor 和 Handlebar 文件提供丰富的语言支持。",
+	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序",
+	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
+	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
+	"html.format.contentUnformatted.desc": "以逗号分隔的标记列表，不应在其中重新设置内容的格式。\"null\" 默认为 \"pre\" 标记。",
+	"html.format.indentInnerHtml.desc": "缩进 <head> 和 <body> 部分。",
+	"html.format.preserveNewLines.desc": "是否要保留元素前面的现有换行符。仅适用于元素前，不适用于标记内或文本。",
+	"html.format.maxPreserveNewLines.desc": "要保留在一个区块中的换行符的最大数量。对于无限制使用 \"null\"。",
+	"html.format.indentHandlebars.desc": "格式和缩进 {{#foo}} 和 {{/foo}}。",
+	"html.format.endWithNewline.desc": "以新行结束。",
+	"html.format.extraLiners.desc": "标记列表，以逗号分隔，其前应有额外新行。\"null\" 默认为“标头、正文、/html”。",
+	"html.format.wrapAttributes.desc": "对属性进行换行。",
+	"html.format.wrapAttributes.auto": "仅在超出行长度时才对属性进行换行。",
+	"html.format.wrapAttributes.force": "对除第一个属性外的其他每个属性进行换行。",
+	"html.format.wrapAttributes.forcealign": "对除第一个属性外的其他每个属性进行换行，并保持对齐。",
+	"html.format.wrapAttributes.forcemultiline": "对每个属性进行换行。",
+	"html.suggest.angular1.desc": "配置内置 HTML 语言支持是否建议 Angular V1 标记和属性。",
+	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。",
+	"html.suggest.html5.desc": "配置内置 HTML 语言支持是否建议 HTML5 标记、属性和值。",
+	"html.trace.server.desc": "跟踪 VS Code 与 HTML 语言服务器之间的通信。",
+	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
+	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。",
+	"html.autoClosingTags": "启用/禁用 HTML 标记的自动关闭。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html/package.i18n.json b/i18n/chs/extensions/html/package.i18n.json
index 3f12dd7154e..ba42e46c478 100644
--- a/i18n/chs/extensions/html/package.i18n.json
+++ b/i18n/chs/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML 语言功能",
-	"description": "为 HTML、Razor 和 Handlebar 文件提供丰富的语言支持。",
-	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序",
-	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
-	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
-	"html.format.contentUnformatted.desc": "以逗号分隔的标记列表，不应在其中重新设置内容的格式。\"null\" 默认为 \"pre\" 标记。",
-	"html.format.indentInnerHtml.desc": "缩进 <head> 和 <body> 部分。",
-	"html.format.preserveNewLines.desc": "是否要保留元素前面的现有换行符。仅适用于元素前，不适用于标记内或文本。",
-	"html.format.maxPreserveNewLines.desc": "要保留在一个区块中的换行符的最大数量。对于无限制使用 \"null\"。",
-	"html.format.indentHandlebars.desc": "格式和缩进 {{#foo}} 和 {{/foo}}。",
-	"html.format.endWithNewline.desc": "以新行结束。",
-	"html.format.extraLiners.desc": "标记列表，以逗号分隔，其前应有额外新行。\"null\" 默认为“标头、正文、/html”。",
-	"html.format.wrapAttributes.desc": "对属性进行换行。",
-	"html.format.wrapAttributes.auto": "仅在超出行长度时才对属性进行换行。",
-	"html.format.wrapAttributes.force": "对除第一个属性外的其他每个属性进行换行。",
-	"html.format.wrapAttributes.forcealign": "对除第一个属性外的其他每个属性进行换行，并保持对齐。",
-	"html.format.wrapAttributes.forcemultiline": "对每个属性进行换行。",
-	"html.suggest.angular1.desc": "配置内置 HTML 语言支持是否建议 Angular V1 标记和属性。",
-	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。",
-	"html.suggest.html5.desc": "配置内置 HTML 语言支持是否建议 HTML5 标记、属性和值。",
-	"html.trace.server.desc": "跟踪 VS Code 与 HTML 语言服务器之间的通信。",
-	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
-	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。",
-	"html.experimental.syntaxFolding": "启用或禁用语法折叠标记。",
-	"html.autoClosingTags": "启用/禁用 HTML 标记的自动关闭。"
+	"displayName": "HTML 语言基础功能",
+	"description": "在 HTML 文件中提供语法高亮、括号匹配和代码片段功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..dac0ceb960a
--- /dev/null
+++ b/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "JSON 语言服务器"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json-language-features/package.i18n.json b/i18n/chs/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..340eded0989
--- /dev/null
+++ b/i18n/chs/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "JSON 语言功能",
+	"description": "为 JSON 文件提供丰富的语言支持",
+	"json.schemas.desc": "将当前项目中的 JSON 文件与架构关联起来",
+	"json.schemas.url.desc": "当前目录中指向架构的 URL 或相对路径",
+	"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时，用于匹配的一组文件模式。",
+	"json.schemas.fileMatch.item.desc": "将 JSON 文件解析到架构时，用于匹配的可以包含 \"*\" 的文件模式。",
+	"json.schemas.schema.desc": "给定 URL 的架构定义。只需提供该架构以避免对架构 URL 的访问。",
+	"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
+	"json.tracing.desc": "跟踪 VS Code 与 JSON 语言服务器之间的通信。",
+	"json.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json/package.i18n.json b/i18n/chs/extensions/json/package.i18n.json
index baafcd7474e..6138d8e11f1 100644
--- a/i18n/chs/extensions/json/package.i18n.json
+++ b/i18n/chs/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON 语言功能",
-	"description": "为 JSON 文件提供丰富的语言支持",
-	"json.schemas.desc": "将当前项目中的 JSON 文件与架构关联起来",
-	"json.schemas.url.desc": "当前目录中指向架构的 URL 或相对路径",
-	"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时，用于匹配的一组文件模式。",
-	"json.schemas.fileMatch.item.desc": "将 JSON 文件解析到架构时，用于匹配的可以包含 \"*\" 的文件模式。",
-	"json.schemas.schema.desc": "给定 URL 的架构定义。只需提供该架构以避免对架构 URL 的访问。",
-	"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
-	"json.tracing.desc": "跟踪 VS Code 与 JSON 语言服务器之间的通信。",
-	"json.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
-	"json.experimental.syntaxFolding": "启用或禁用语法折叠标记。"
+	"displayName": "JSON 语言基础功能",
+	"description": "在 JSON 文件中提供语法高亮和括号匹配功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..d0a2ce8701e
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "无法加载“markdown.styles”：{0}"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..479e1e30f0b
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[预览] {0}",
+	"previewTitle": "预览 {0}"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..6a53189d1b3
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "已禁用此文档中的部分内容",
+	"preview.securityMessage.title": "已禁用此 Markdown 预览中的可能不安全的内容。更改 Markdown 预览安全设置以允许不安全内容或启用脚本。",
+	"preview.securityMessage.label": "已禁用内容安全警告"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/security.i18n.json b/i18n/chs/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..152913f9116
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "严格",
+	"strict.description": "仅载入安全内容",
+	"insecureContent.title": "允许不安全内容",
+	"insecureContent.description": "允许通过 http 载入内容",
+	"disable.title": "禁用",
+	"disable.description": "允许所有内容，执行所有脚本。不推荐",
+	"moreInfo.title": "详细信息",
+	"enableSecurityWarning.title": "在此工作区中启用预览安全警告",
+	"disableSecurityWarning.title": "在此工作区中取消预览安全警告",
+	"toggleSecurityWarning.description": "不影响内容安全级别",
+	"preview.showPreviewSecuritySelector.title": "选择此工作区中 Markdown 预览的安全设置"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/package.i18n.json b/i18n/chs/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..6790472bfc0
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Markdown 语言功能",
+	"description": "为 Markdown 提供丰富的语言支持。",
+	"markdown.preview.breaks.desc": "设置换行符如何在 markdown 预览中呈现。将其设置为 \"true\" 会为每一个新行创建一个 <br>。",
+	"markdown.preview.linkify": "在 Markdown 预览中启用或禁用将类似 URL 的文本转换为链接。",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 预览中双击切换到编辑器。",
+	"markdown.preview.fontFamily.desc": "控制 Markdown 预览中使用的字体系列。",
+	"markdown.preview.fontSize.desc": "控制 Markdown 预览中使用的字号(以像素为单位)。",
+	"markdown.preview.lineHeight.desc": "控制 Markdown 预览中使用的行高。此数值与字号相关。",
+	"markdown.preview.markEditorSelection.desc": "在 Markdown 预览中标记当前的编辑器选定内容。",
+	"markdown.preview.scrollEditorWithPreview.desc": "滚动 Markdown 预览时，更新其编辑器视图。",
+	"markdown.preview.scrollPreviewWithEditor.desc": "滚动 Markdown 编辑器时，更新其预览视图。",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[弃用] 滚动 Markdown 预览以显示编辑器当前所选行。",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此设置已被 \"markdown.preview.scrollPreviewWithEditor\" 替换且不再有任何效果。",
+	"markdown.preview.title": "打开预览",
+	"markdown.previewFrontMatter.dec": "设置如何在 Markdown 预览中呈现 YAML 扉页。“隐藏”会删除扉页。否则，扉页则被视为 Markdown 内容。",
+	"markdown.previewSide.title": "打开侧边预览",
+	"markdown.showLockedPreviewToSide.title": "在侧边打开锁定的预览",
+	"markdown.showSource.title": "显示源",
+	"markdown.styles.dec": "要在 Markdown 预览中使用的 CSS 样式表的 URL 或本地路径列表。相对路径被解释为相对于资源管理器中打开的文件夹。如果没有任何打开的文件夹，则会被解释为相对于 Markdown 文件的位置。所有的 \"\\\" 需写为 \"\\\\\"。",
+	"markdown.showPreviewSecuritySelector.title": "更改预览安全设置",
+	"markdown.trace.desc": "对 Markdown 扩展启用调试日志记录。",
+	"markdown.preview.refresh.title": "刷新预览",
+	"markdown.preview.toggleLock.title": "切换开关锁定预览"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..c5281f10087
--- /dev/null
+++ b/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "是否允许执行 {0} (定义为工作区设置)以进行 PHP 文件的 lint 操作?",
+	"php.yes": "Allow",
+	"php.no": "不允许",
+	"wrongExecutable": "无法验证，因为 {0} 不是有效的 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
+	"noExecutable": "无法验证，因为未设置任何 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
+	"unknownReason": "使用路径运行 php 失败: {0}。原因未知。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php-language-features/package.i18n.json b/i18n/chs/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..0871582ebd7
--- /dev/null
+++ b/i18n/chs/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "如果已启用内置 PHP 语言建议，则进行配置。此支持建议 PHP 全局变量和变量。",
+	"configuration.validate.enable": "启用/禁用内置的 PHP 验证。",
+	"configuration.validate.executablePath": "指向 PHP 可执行文件。",
+	"configuration.validate.run": "决定 linter 是在保存时还是输入时运行。",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "禁止 PHP 验证程序(定义为工作区设置)",
+	"displayName": "PHP 语言功能",
+	"description": "为 PHP 文件提供丰富的语言支持。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php/package.i18n.json b/i18n/chs/extensions/php/package.i18n.json
index 8385016844b..4de84845dc2 100644
--- a/i18n/chs/extensions/php/package.i18n.json
+++ b/i18n/chs/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "如果已启用内置 PHP 语言建议，则进行配置。此支持建议 PHP 全局变量和变量。",
-	"configuration.validate.enable": "启用/禁用内置的 PHP 验证。",
-	"configuration.validate.executablePath": "指向 PHP 可执行文件。",
-	"configuration.validate.run": "决定 linter 是在保存时还是输入时运行。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "禁止 PHP 验证程序(定义为工作区设置)",
 	"displayName": "PHP 语言功能",
-	"description": "为 PHP 文件提供 IntelliSense、lint 和语言基础功能。"
+	"description": "为 PHP 文件提供语法高亮和括号匹配功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 7980ba2eb43..1be236770c9 100644
--- a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "未找到结果",
 	"settingsSearchIssue": "设置搜索的问题",
 	"bugReporter": "问题报告",
-	"performanceIssue": "性能问题",
 	"featureRequest": "功能请求",
+	"performanceIssue": "性能问题",
 	"stepsToReproduce": "重现步骤",
 	"bugDescription": "请分享能稳定重现此问题的必要步骤，并包含实际和预期的结果。我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
 	"performanceIssueDesciption": "这个性能问题是在什么时候发生的? 是在启动时，还是在一系列特定的操作之后? 我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
diff --git a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 60f9a85b4bf..3a1ef19744b 100644
--- a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -57,7 +57,7 @@
 	"formatOnPaste": "控制编辑器是否应自动设置粘贴内容的格式。格式化程序必须可用并且能设置文档中某一范围的格式。",
 	"autoIndent": "控制编辑器是否在用户键入、粘贴或移动行时自动调整缩进。语言的缩进规则必须可用。",
 	"suggestOnTriggerCharacters": "控制键入触发器字符时是否应自动显示建议",
-	"acceptSuggestionOnEnter": "控制按“Enter”键是否像按“Tab”键一样接受建议。这能帮助避免“插入新行”和“接受建议”之间的歧义。值为“smart”时表示，仅当文字改变时，按“Enter”键才能接受建议",
+	"acceptSuggestionOnEnter": "控制按下 \"Enter\" 键是否像 \"Tab\" 键一样接受建议。这能减少“插入新行”和“接受建议”命令之间的歧义。若此项的值为 \"smart\"，则仅在文字改变时，\"Enter\" 键才能接受建议",
 	"acceptSuggestionOnCommitCharacter": "控制是否应在遇到提交字符时接受建议。例如，在 JavaScript 中，分号(\";\")可以为提交字符，可接受建议并键入该字符。",
 	"snippetSuggestions.top": "在其他建议上方显示代码片段建议。",
 	"snippetSuggestions.bottom": "在其他建议下方显示代码片段建议。",
diff --git a/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 522811eea83..30bc289af02 100644
--- a/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,9 @@
 	"warningBorder": "编辑器中警告波浪线的边框颜色。",
 	"infoForeground": "编辑器中信息波浪线的前景色。",
 	"infoBorder": "编辑器中信息波浪线的边框颜色。",
-	"overviewRulerRangeHighlight": "概述范围突出显示的标尺标记颜色。",
+	"hintForeground": "编辑器中提示波浪线的前景色。",
+	"hintBorder": "编辑器中提示波浪线的边框颜色。",
+	"overviewRulerRangeHighlight": "概览标尺中高亮范围的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
 	"overviewRuleError": "概述错误的标尺标记颜色。",
 	"overviewRuleWarning": "概述警告的标尺标记颜色。",
 	"overviewRuleInfo": "概述信息的标尺标记颜色。"
diff --git a/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
index 9e2c4fd733b..11f63183173 100644
--- a/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
@@ -18,6 +18,6 @@
 	"label.replaceAllButton": "全部替换",
 	"label.toggleReplaceButton": "切换替换模式",
 	"title.matchesCountLimit": "仅高亮了前 {0} 个结果，但所有查找操作均针对全文。",
-	"label.matchesLocation": "第 {0} 个(共 {1} 个)",
+	"label.matchesLocation": "{0} / {1}",
 	"label.noResults": "无结果"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 8cd97dfccb1..52c19604c8e 100644
--- a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "转到下一个问题 (错误、警告、信息)",
-	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)",
-	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
-	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
-	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
-	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
+	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..321c1e11989
--- /dev/null
+++ b/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
+	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
+	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
+	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..4729c703440
--- /dev/null
+++ b/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"Sunday": "星期日",
+	"Monday": "星期一",
+	"Tuesday": "星期二",
+	"Wednesday": "星期三",
+	"Thursday": "星期四",
+	"Friday": "星期五",
+	"Saturday": "星期六",
+	"SundayShort": "周日",
+	"MondayShort": "周一",
+	"TuesdayShort": "周二",
+	"WednesdayShort": "周三",
+	"ThursdayShort": "周四",
+	"FridayShort": "周五",
+	"SaturdayShort": "周六",
+	"January": "一月",
+	"February": "二月",
+	"March": "三月",
+	"April": "四月",
+	"May": "五月",
+	"June": "六月",
+	"July": "七月",
+	"August": "八月",
+	"September": "九月",
+	"October": "十月",
+	"November": "十一月",
+	"December": "十二月",
+	"JanuaryShort": "1月",
+	"FebruaryShort": "2月",
+	"MarchShort": "3月",
+	"AprilShort": "4月",
+	"MayShort": "5月",
+	"JuneShort": "6月",
+	"JulyShort": "7月",
+	"AugustShort": "8月",
+	"SeptemberShort": "9月",
+	"OctoberShort": "10月",
+	"NovemberShort": "11月",
+	"DecemberShort": "12月"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 9b8693d941b..1340c8a0009 100644
--- a/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "符号在进行写入访问操作时的背景颜色，例如写入变量时。颜色必须透明，使其不会挡住下方的其他元素。",
 	"wordHighlightBorder": "符号在进行读取访问操作时的边框颜色，例如读取变量。",
 	"wordHighlightStrongBorder": "符号在进行写入访问操作时的边框颜色，例如写入变量。",
-	"overviewRulerWordHighlightForeground": "概述符号突出显示的标尺标记颜色。",
-	"overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。",
+	"overviewRulerWordHighlightForeground": "概览标尺中符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
+	"overviewRulerWordHighlightStrongForeground": "概览标尺中写入访问符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
 	"wordHighlight.next.label": "转到下一个突出显示的符号",
 	"wordHighlight.previous.label": "转到上一个突出显示的符号"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..d31cf13c73b
--- /dev/null
+++ b/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 个其他文件未显示",
+	"moreFiles": "...{0} 个其他文件未显示"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..7667b941599
--- /dev/null
+++ b/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "取消"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index f27f13cb3e4..4405f580f16 100644
--- a/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "安装依赖项时出错。{0}",
 	"MarketPlaceDisabled": "商店未启用",
 	"removeError": "删除扩展时出错: {0}。请重启 VS Code，然后重试。",
-	"Not Market place extension": "只能重新安装商店中的扩展",
+	"Not a Marketplace extension": "只能重新安装商店中的扩展",
 	"notFoundCompatible": "无法安装“{0}”；没有可用的版本与 VS Code “{1}”兼容。",
 	"malicious extension": "无法安装此扩展，它被报告存在问题。",
 	"notFoundCompatibleDependency": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的依赖扩展“{0}”。",
 	"quitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
 	"exitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
 	"uninstallDependeciesConfirmation": "要仅卸载“{0}”或者其依赖项也一起卸载?",
-	"uninstallOnly": "仅",
-	"uninstallAll": "全部",
+	"uninstallOnly": "仅此扩展",
+	"uninstallAll": "全部卸载",
 	"uninstallConfirmation": "是否确定要卸载“{0}”?",
 	"ok": "确定",
 	"singleDependentError": "无法卸载扩展程序“{0}”。扩展程序“{1}”依赖于此。",
diff --git a/i18n/chs/src/vs/platform/list/browser/listService.i18n.json b/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
index 9131b6edaea..eaaf335f684 100644
--- a/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
@@ -9,8 +9,9 @@
 	"workbenchConfigurationTitle": "工作台",
 	"multiSelectModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)",
 	"multiSelectModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)",
-	"multiSelectModifier": "在通过鼠标多选树和列表条目时使用的修改键 (例如资资源管理器、打开的编辑器和源代码管理视图)。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“打开到侧边”功能所需的鼠标动作 (若可用) 将会相应调整，不与多选修改键冲突。",
+	"multiSelectModifier": "在通过鼠标多选树和列表条目时使用的修改键 (例如资资源管理器、打开的编辑器和源代码管理视图)。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“在侧边打开”功能所需的鼠标动作 (若可用) 将会相应调整，不与多选修改键冲突。",
 	"openMode.singleClick": "在鼠标单击时打开项目。",
 	"openMode.doubleClick": "在鼠标双击时打开项目。",
-	"openModeModifier": "控制如何在受支持的树和列表中使用鼠标来打开项目。设置为 \"singleClick\" 可单击打开项目，\"doubleClick\" 仅可双击打开项目。对于树中含子节点的节点，此设置将控制使用单击还是双击来展开他们。注意，某些不适用此项的树或列表可能会忽略此设置。"
+	"openModeModifier": "控制如何在受支持的树和列表中使用鼠标来打开项目。设置为 \"singleClick\" 可单击打开项目，\"doubleClick\" 仅可双击打开项目。对于树中含子节点的节点，此设置将控制使用单击还是双击来展开他们。注意，某些不适用此项的树或列表可能会忽略此设置。",
+	"horizontalScrolling setting": "控制工作台中的树控件是否支持水平滚动。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/markers/common/markers.i18n.json b/i18n/chs/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..3112dd48a98
--- /dev/null
+++ b/i18n/chs/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "错误",
+	"sev.warning": "警告",
+	"sev.info": "信息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
index 598112affdf..c7001f8f909 100644
--- a/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "内联合并冲突中当前版本区域的概览标尺前景色。",
 	"overviewRulerIncomingContentForeground": "内联合并冲突中传入的版本区域的概览标尺前景色。",
 	"overviewRulerCommonContentForeground": "内联合并冲突中共同祖先区域的概览标尺前景色。",
-	"overviewRulerFindMatchForeground": "概述查找匹配项的标尺标记颜色。",
-	"overviewRulerSelectionHighlightForeground": "概述选择突出显示的标尺标记颜色。"
+	"overviewRulerFindMatchForeground": "概览标尺中查找匹配项的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
+	"overviewRulerSelectionHighlightForeground": "概览标尺中选择高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index f32f968237d..7481ffd0270 100644
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "在 {0}ms 后终止了保存时进行的格式设置",
+	"timeout.onWillSave": "在 1750ms 后终止了 onWillSaveTextDocument 事件",
 	"saveParticipants": "正在运行保存参与程序..."
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..07256b420b4
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"extensionSource": "{0} (扩展)"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 1a0a450a870..d88886a3538 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "聚焦于下一个组",
 	"openToSide": "打开到侧边",
 	"closeEditor": "关闭编辑器",
+	"closeOneEditor": "关闭",
 	"revertAndCloseActiveEditor": "还原并关闭编辑器",
 	"closeEditorsToTheLeft": "关闭左侧编辑器",
 	"closeAllEditors": "关闭所有编辑器",
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 6d4f38ad836..928aff21e49 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "关闭",
 	"araLabelEditorActions": "编辑器操作"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 5a636ad8868..de6818efc1d 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "没有新通知",
 	"notifications": "通知",
 	"notificationsToolbar": "通知中心操作",
 	"notificationsList": "通知列表"
diff --git a/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 7644ead4a4b..a50946c2cfc 100644
--- a/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "窗口",
 	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
 	"window.openFilesInNewWindow.off": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开",
-	"window.openFilesInNewWindow.default": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开，除非通过平台或从查找程序(仅限 macOS)打开",
-	"openFilesInNewWindow": "控制是否应在新窗口中打开文件。\n- default: 文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开，除非该文件通过平台或从查找程序(仅限 macOS)打开\n- on: 文件将在新窗口中打开\n- off: 文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开\n注意，可能仍会存在忽略此设置的情况(例如当使用 -new-window 或 -reuse-window 命令行选项时)。",
+	"window.openFilesInNewWindow.defaultMac": "在不通过“程序坞”(Dock) 或“访达”(Finder) 打开的情况下，文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开",
+	"window.openFilesInNewWindow.default": "除了从软件内部选择的文件 (如，从“文件”菜单选择)，其他所有文件都将在新窗口中打开",
+	"openFilesInNewWindowMac": "控制是否在新窗口中打开文件。\n- default: 在不通过“程序坞”(Dock) 或“访达”(Finder) 打开的情况下，文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n- on: 文件将在新窗口中打开\n- off: 文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
+	"openFilesInNewWindow": "控制是否在新窗口中打开文件。\n- default: 除了从软件内部选择的文件 (如，从“文件”菜单选择)，其他所有文件都将在新窗口中打开\n- on: 文件将在新窗口中打开\n- off: 文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
 	"window.openFoldersInNewWindow.on": "文件夹将在新窗口中打开",
 	"window.openFoldersInNewWindow.off": "文件夹将替换上一个活动窗口",
 	"window.openFoldersInNewWindow.default": "文件夹在新窗口中打开，除非从应用程序内选取一个文件夹(例如，通过“文件”菜单)",
 	"openFoldersInNewWindow": "控制文件夹应在新窗口中打开还是替换上一活动窗口。\n- default: 文件夹将在新窗口中打开，除非文件是从应用程序内选取的(例如通过“文件”菜单)\n- on: 文件夹将在新窗口中打开\n- off: 文件夹将替换上一活动窗口\n注意，可能仍会存在忽略此设置的情况(例如当使用 -new-window 或 -reuse-window 命令行选项时)。",
+	"window.openWithoutArgumentsInNewWindow.on": "打开一个新的空窗口",
+	"window.openWithoutArgumentsInNewWindow.off": "聚焦于最后活动的运行实例",
+	"openWithoutArgumentsInNewWindow": "控制在另一实例无参启动时打开新的空窗口或是聚焦到最后运行的实例\n- on: 打开新的空窗口\n- off: 最后活动的运行实例将获得焦点\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
 	"window.reopenFolders.all": "重新打开所有窗口。",
 	"window.reopenFolders.folders": "重新打开所有文件夹。空工作区将不会被恢复。",
 	"window.reopenFolders.one": "重新打开上一个活动窗口。",
@@ -58,7 +63,7 @@
 	"restoreWindows": "控制重启后重新打开窗口的方式。选择 \"none\" 则永远在启动时打开一个空工作区，\"one\" 则重新打开最后使用的窗口，\"folders\" 则重新打开所有含有文件夹的窗口，\"all\" 则重新打开上次会话的所有窗口。",
 	"restoreFullscreen": "如果窗口已退出全屏模式，控制其是否应还原为全屏模式。",
 	"zoomLevel": "调整窗口的缩放级别。原始大小是 0，每次递增(例如 1)或递减(例如 -1)表示放大或缩小 20%。也可以输入小数以便以更精细的粒度调整缩放级别。",
-	"title": "根据活动编辑器控制窗口标题。变量基于上下文进行替换:\n${activeEditorShort}: 文件名 (如 myFile.txt)\n${activeEditorMedium}: 相对于工作区文件夹的文件路径 (如 myFolder/myFile.txt)\n${activeEditorLong}: 文件的完整路径 (如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 文件所在工作区文件夹名称 (如 myFolder)\n${folderPath}: 文件所在工作区文件夹路径 (如 /Users/Development/myFolder)\n${rootName}: 工作区名称 (如 myFolder 或 myWorkspace)\n${rootPath}: 工作区路径 (如 /Users/Development/myWorkspace)\n${appName}: 如 VS Code\n${dirty}: 活动编辑器有更新时显示的更新指示器\n${separator}: 仅在被有值变量包围时显示的分隔符 (\" - \")",
+	"title": "根据活动编辑器控制窗口标题。变量基于上下文进行替换:\n${activeEditorShort}: 文件名 (如 myFile.txt)\n${activeEditorMedium}: 相对于工作区文件夹的文件路径 (如 myFolder/myFile.txt)\n${activeEditorLong}: 文件的完整路径 (如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 文件所在工作区文件夹名称 (如 myFolder)\n${folderPath}: 文件所在工作区文件夹路径 (如 /Users/Development/myFolder)\n${rootName}: 工作区名称 (如 myFolder 或 myWorkspace)\n${rootPath}: 工作区路径 (如 /Users/Development/myWorkspace)\n${appName}: 如 VS Code\n${dirty}: 活动编辑器有更新时显示的更新指示器\n${separator}: 仅在被有值变量或静态文本包围时显示的分隔符 (\" - \")",
 	"window.newWindowDimensions.default": "在屏幕中心打开新窗口。",
 	"window.newWindowDimensions.inherit": "以与上一个活动窗口相同的尺寸打开新窗口。",
 	"window.newWindowDimensions.maximized": "打开最大化的新窗口。",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "如果已启用，将自动更改为高对比度主题；如果 Windows 正在使用高对比度主题，则当离开 Windows 高对比度主题时会更改为深色主题。",
 	"titleBarStyle": "调整窗口标题栏的外观。更改需要在完全重启后才能应用。",
 	"window.nativeTabs": "\n启用macOS Sierra窗口选项卡。请注意，更改需要完全重新启动程序才能生效。如果配置此选项，本机选项卡将禁用自定义标题栏样式。",
+	"window.smoothScrollingWorkaround": "启用解决方案来修复还原最小化的 VS Code 窗口后平滑滚动消失的问题。这个滚动的卡顿问题出现在拥有精确式触控板的设备上，比如来自 Microsoft 的 Surface 设备(https://github.com/Microsoft/vscode/issues/13612)。如果启用这个解决方案，窗口布局可能会在从最小化状态中还原后有些许闪烁，其他方面则无大碍。",
 	"zenModeConfigurationTitle": "Zen 模式",
 	"zenMode.fullScreen": "控制打开 Zen Mode 是否也会将工作台置于全屏模式。",
 	"zenMode.centerLayout": "控制是否在 Zen 模式中启用居中布局",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 1ea6ff1c848..934cfe0c69a 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "未验证的断点",
 	"functionBreakpointUnsupported": "不受此调试类型支持的函数断点",
 	"breakpointDirtydHover": "未验证的断点。对文件进行了修改，请重启调试会话。",
+	"logBreakpointUnsupported": "不受此调试类型支持的记录点",
 	"conditionalBreakpointUnsupported": "不受此调试类型支持的条件断点",
 	"hitBreakpointUnsupported": "命中不受此调试类型支持的条件断点"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 02039decac5..13779c68478 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "重新启动框架",
 	"removeBreakpoint": "删除断点",
 	"removeAllBreakpoints": "删除所有断点",
-	"enableBreakpoint": "启用断点",
-	"disableBreakpoint": "禁用断点",
 	"enableAllBreakpoints": "启用所有断点",
 	"disableAllBreakpoints": "禁用所有断点",
 	"activateBreakpoints": "激活断点",
 	"deactivateBreakpoints": "停用断点",
 	"reapplyAllBreakpoints": "重新应用所有断点",
 	"addFunctionBreakpoint": "添加函数断点",
-	"addConditionalBreakpoint": "添加条件断点...",
-	"editConditionalBreakpoint": "编辑断点...",
 	"setValue": "设置值",
 	"addWatchExpression": "添加表达式",
 	"editWatchExpression": "编辑表达式",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 7d2c3c69973..0502fc22efb 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "调试: 切换断点",
 	"conditionalBreakpointEditorAction": "调试: 添加条件断点...",
+	"logPointEditorAction": "调试: 添加记录点...",
 	"runToCursor": "运行到光标处",
 	"debugEvaluate": "调试: 求值",
 	"debugAddToWatch": "调试: 添加到监视",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
index 49488144659..710d5957387 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
@@ -6,6 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"fileLinkMac": "点击以跟进(Cmd + 点击打开到侧边)",
-	"fileLink": "点击以跟进(Ctrl + 点击打开到侧边))"
+	"fileLinkMac": "单击打开 (按住 Cmd 键并单击在侧边打开)",
+	"fileLink": "单击打开 (按住 Ctrl 键并单击在侧边打开)"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..dd2cc47ea67
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetLogMessagePlaceholder": "断点命中时记录的消息。“Enter”键确认，“Esc”键取消。",
+	"breakpointWidgetHitCountPlaceholder": "在满足命中次数条件时中断。按 \"Enter\" 表示接受，\"Esc\" 表示取消。",
+	"breakpointWidgetExpressionPlaceholder": "在表达式计算结果为 true 时中断。按 \"Enter\" 表示接受，\"Esc\" 表示取消。",
+	"breakpointWidgetLogMessageAriaLabel": "程序将在每次命中此断点时记录这条消息。按 Enter 键接受或按 Esc 键取消。",
+	"breakpointWidgetHitCountAriaLabel": "如果达到命中次数，程序仅会在此处停止。按 Enter 接受或按 Esc 取消。",
+	"breakpointWidgetAriaLabel": "如果此条件为 true，程序仅会在此处停止。按 Enter 接受或按 Esc 取消。",
+	"expression": "表达式",
+	"hitCount": "命中次数",
+	"logMessage": "记录消息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 62dad9c4bce..aaeabd5e279 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "编辑断点...",
+	"disableBreakpoint": "禁用断点",
+	"enableBreakpoint": "启用断点",
 	"removeBreakpoints": "删除断点",
 	"removeBreakpointOnColumn": "在列 {0} 上删除断点",
 	"removeLineBreakpoint": "删除行断点",
@@ -18,5 +21,7 @@
 	"enableBreakpoints": "在列 {0} 上启用断点",
 	"enableBreakpointOnLine": "启用行断点",
 	"addBreakpoint": "添加断点",
+	"conditionalBreakpoint": "添加条件断点...",
+	"addLogPoint": "添加记录点...",
 	"addConfiguration": "添加配置..."
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 5b3c6a5614e..d713b18f9f7 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "显示错误",
 	"noFolderWorkspaceDebugError": "无法调试活动文件。请确保它保存在磁盘上，并确保已为该文件类型安装了调试扩展。",
 	"cancel": "取消",
-	"DebugTaskNotFound": "找不到 preLaunchTask“{0}”。",
-	"taskNotTracked": "无法跟踪 preLaunchTask “{0}”。"
+	"DebugTaskNotFound": "找不到任务“{0}”。",
+	"taskNotTracked": "无法跟踪任务“{0}”。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index c5cb1601362..8348a07cd0e 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
@@ -18,6 +18,7 @@
 	"debugRequest": "请求配置类型。可以是“启动”或“附加”。",
 	"debugServer": "仅用于调试扩展开发: 如果已指定端口，VS 代码会尝试连接到在服务器模式中运行的调试适配器",
 	"debugPrelaunchTask": "调试会话开始前要运行的任务。",
+	"debugPostDebugTask": "调试会话结束后运行的任务。",
 	"debugWindowsConfiguration": "特定于 Windows 的启动配置属性。",
 	"debugOSXConfiguration": "特定于 OS X 的启动配置属性。",
 	"debugLinuxConfiguration": "特定于 Linux 的启动配置属性。",
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 383bbbf1ba0..2a4e9d7f43f 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "配置建议的扩展(工作区文件夹)",
 	"malicious tooltip": "此扩展被报告存在问题。",
 	"malicious": "恶意扩展",
+	"disabled": "已禁用",
+	"disabled globally": "已禁用",
+	"disabled workspace": "已在此工作区禁用",
 	"disableAll": "禁用所有已安装的扩展",
 	"disableAllWorkspace": "禁用此工作区的所有已安装的扩展",
 	"enableAll": "启用所有扩展",
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..8c7037df74f
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "扩展名",
+	"extension id": "扩展标识符",
+	"preview": "预览版",
+	"builtin": "内置",
+	"publisher": "发布服务器名称",
+	"install count": "安装计数",
+	"rating": "评级",
+	"repository": "存储库",
+	"license": "许可证",
+	"details": "详细信息",
+	"contributions": "发布内容",
+	"changelog": "更改日志",
+	"dependencies": "依赖项",
+	"noReadme": "无可用自述文件。",
+	"noChangelog": "无可用的更改日志。",
+	"noContributions": "没有发布内容",
+	"noDependencies": "没有依赖项",
+	"settings": "设置({0})",
+	"setting name": "名称",
+	"description": "描述",
+	"default": "默认",
+	"debuggers": "调试程序({0})",
+	"debugger name": "名称",
+	"debugger type": "类型",
+	"views": "视图 ({0})",
+	"view id": "ID",
+	"view name": "名称",
+	"view location": "位置",
+	"localizations": "本地化 ({0})",
+	"localizations language id": "语言 ID",
+	"localizations language name": "语言名称",
+	"localizations localized language name": "语言的本地名称",
+	"colorThemes": "颜色主题 ({0})",
+	"iconThemes": "图标主题 ({0})",
+	"colors": "颜色 ({0})",
+	"colorId": "ID",
+	"defaultDark": "深色默认",
+	"defaultLight": "浅色默认",
+	"defaultHC": "高对比度默认",
+	"JSON Validation": "JSON 验证({0})",
+	"fileMatch": "匹配文件",
+	"schema": "结构",
+	"commands": "命令({0})",
+	"command name": "名称",
+	"keyboard shortcuts": "键盘快捷方式",
+	"menuContexts": "菜单上下文",
+	"languages": "语言({0})",
+	"language id": "ID",
+	"language name": "名称",
+	"file extensions": "文件扩展名",
+	"grammar": "语法",
+	"snippets": "代码片段"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 35b4eb3a0e8..d16ee08c77d 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -7,7 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"neverShowAgain": "不再显示",
-	"searchMarketplace": "搜索应用商店",
+	"searchMarketplace": "搜索商店",
 	"showLanguagePackExtensions": "商店中有可以将 VS Code 本地化为“{0}”语言的扩展。",
 	"dynamicWorkspaceRecommendation": "您可能会对这个扩展感兴趣，它在 {0} 存储库的用户间流行。",
 	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 186eff5c175..292dde16d60 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "推荐",
 	"otherRecommendedExtensions": "其他推荐",
 	"workspaceRecommendedExtensions": "工作区推荐",
-	"builtInExtensions": "内置",
+	"builtInExtensions": "功能",
+	"builtInThemesExtensions": "主题",
+	"builtInBasicsExtensions": "语言",
 	"searchExtensions": "在商店中搜索扩展",
 	"sort by installs": "排序依据: 安装计数",
 	"sort by rating": "排序依据: 分级",
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index 0eaa7947445..1b8f196bc9e 100644
--- a/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "文本文件编辑器",
 	"createFile": "创建文件",
+	"relaunchWithIncreasedMemoryLimit": "重新启动",
+	"configureMemoryLimit": "配置",
 	"fileEditorWithInputAriaLabel": "{0}。文本文件编辑器。",
 	"fileEditorAriaLabel": "文本文件编辑器。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index a7491087b48..f82464e4491 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -17,7 +17,7 @@
 	"compareActiveWithSaved": "比较活动与已保存的文件",
 	"closeEditor": "关闭编辑器",
 	"view": "查看",
-	"openToSide": "打开到侧边",
+	"openToSide": "在侧边打开",
 	"revealInWindows": "在资源管理器中显示",
 	"revealInMac": "在 Finder 中显示",
 	"openContainer": "打开所在的文件夹",
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index b5a25dbf287..aef6c2652d0 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,8 +34,10 @@
 	"confirmDeleteMessageFolder": "是否确定要永久删除“{0}”及其内容?",
 	"confirmDeleteMessageFile": "是否确定要永久删除“{0}”?",
 	"irreversible": "此操作不可逆!",
-	"cancel": "取消",
-	"permDelete": "永久删除",
+	"binFailed": "无法删除到回收站。是否永久删除？",
+	"trashFailed": "无法删除到废纸篓。是否永久删除？",
+	"deletePermanentlyButtonLabel": "永久删除(&&D)",
+	"retryButtonLabel": "重试(&&R)",
 	"importFiles": "导入文件",
 	"confirmOverwrite": "目标文件夹中已存在具有相同名称的文件或文件夹。是否要替换它?",
 	"replaceButtonLabel": "替换(&&R)",
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 341096873d5..15d0a742680 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -35,8 +35,10 @@
 	"hotExit": "控制是否在会话间记住未保存的文件，以允许在退出编辑器时跳过保存提示。",
 	"useExperimentalFileWatcher": "使用新的试验文件观察程序。",
 	"defaultLanguage": "分配给新文件的默认语言模式。",
+	"maxMemoryForLargeFilesMB": "在尝试打开大型文件时，重新启动程序后应用的新的内存限制 (MB)。如果您希望以较高的限制启动，可以在命令行启动时添加参数 \"--max-memory=新的大小\" 。",
 	"editorConfigurationTitle": "编辑器",
 	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
+	"formatOnSaveTimeout": "在保存时格式化操作的超时时间。为 formatOnSave 命令指定时间限制 (单位: 毫秒)。运行超过设定时间的命令将被取消。",
 	"explorerConfigurationTitle": "文件资源管理器",
 	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。",
 	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index a9f0a0ac95a..50c7a30328b 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -13,7 +13,9 @@
 	"dropFolder": "你是否要将文件夹添加到工作区?",
 	"addFolders": "添加文件夹(&&A)",
 	"addFolder": "添加文件夹(&&A)",
+	"confirmRootsMove": "是否确定要更改工作区中多个根文件夹的顺序?",
 	"confirmMultiMove": "是否确定要移动以下 {0} 个文件?",
+	"confirmRootMove": "是否确定要更改工作区中根文件夹“{0}”的顺序?",
 	"confirmMove": "是否确实要移动“{0}”?",
 	"doNotAskAgain": "不再询问",
 	"moveButtonLabel": "移动(&&M)",
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..f094961018a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "HTML 预览"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..2d7ab40f3c9
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "无效的编辑器输入。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..4602f031212
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "开发者"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..bad27cc286a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "打开 Webview 开发工具",
+	"refreshWebviewLabel": "重新加载 Webview"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 42ca809e58b..2bc538eaf9f 100644
--- a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "是否将 VS Code 的界面语言更换为 {0} 并重新启动?",
+	"yes": "是",
+	"no": "否",
+	"doNotAskAgain": "不再询问",
 	"JsonSchema.locale": "要使用的 UI 语言。",
 	"vscode.extension.contributes.localizations": "向编辑器提供本地化内容",
 	"vscode.extension.contributes.localizations.languageId": "显示字符串翻译的目标语言 ID。",
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..7cf34baa098
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "复制",
+	"copyMarkerMessage": "复制消息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..158b3a24233
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "总计 {0} 个问题",
+	"filteredProblems": "显示 {0} 个 (共 {1} 个) 问题"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..f4c0a38ab65
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "问题",
+	"tooltip.1": "此文件存在 1 个问题",
+	"tooltip.N": "此文件存在 {0} 个问题",
+	"markers.showOnFile": "显示关于文件与文件夹的错误与警告。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..9e91dc0ee53
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,44 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "查看",
+	"problems.view.toggle.label": "切换问题 (错误、警告、信息) 视图",
+	"problems.view.focus.label": "聚焦于问题 (错误、警告、信息) 视图",
+	"problems.panel.configuration.title": "问题预览",
+	"problems.panel.configuration.autoreveal": "控制问题预览是否应在打开文件时自动显示它们。",
+	"markers.panel.title.problems": "问题",
+	"markers.panel.aria.label.problems.tree": "按文件分组的问题",
+	"markers.panel.no.problems.build": "目前尚未在工作区检测到问题。",
+	"markers.panel.no.problems.filters": "使用提供的筛选条件未找到结果",
+	"markers.panel.action.filter": "筛选器问题",
+	"markers.panel.filter.placeholder": "按类型或文本进行筛选",
+	"markers.panel.filter.errors": "错误",
+	"markers.panel.filter.warnings": "警告",
+	"markers.panel.filter.infos": "信息",
+	"markers.panel.single.error.label": "1 个错误",
+	"markers.panel.multiple.errors.label": "{0} 个错误",
+	"markers.panel.single.warning.label": "1 条警告",
+	"markers.panel.multiple.warnings.label": "{0} 条警告",
+	"markers.panel.single.info.label": "1 条信息",
+	"markers.panel.multiple.infos.label": "{0} 条信息",
+	"markers.panel.single.unknown.label": "1 个未知",
+	"markers.panel.multiple.unknowns.label": "{0} 个未知",
+	"markers.panel.at.ln.col.number": "({0}，{1})",
+	"problems.tree.aria.label.resource": "含有 {1} 问题的 {0}",
+	"problems.tree.aria.label.marker.relatedInformation": "此问题包含对 {0} 个位置的引用。",
+	"problems.tree.aria.label.error.marker": "{0} 生成的错误: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.error.marker.nosource": "错误: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.warning.marker": "{0} 生成的警告: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "警告: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.info.marker": "{0} 生成的信息: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.info.marker.nosource": "信息: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.marker": "{0} 生成的问题: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.marker.nosource": "问题: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{3} 的 {1} 行 {2} 列，{0}",
+	"errors.warnings.show.label": "显示错误和警告"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index bd4378d469a..d1ae5895425 100644
--- a/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "切换输出",
 	"clearOutput": "清除输出",
 	"toggleOutputScrollLock": "切换输出 Scroll Lock",
-	"switchToOutput.label": "切换到输出"
+	"switchToOutput.label": "切换到输出",
+	"openInLogViewer": "打开日志文件"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 13510a5cdd7..3a4c87eda4f 100644
--- a/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "输出",
 	"logViewer": "日志查看器",
 	"viewCategory": "查看",
-	"clearOutput.label": "清除输出"
+	"clearOutput.label": "清除输出",
+	"openActiveLogOutputFile": "查看: 打开活动日志输出文件"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index c1ce0fdc7a2..c40f2b67618 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -7,6 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"keybindingsInputName": "键盘快捷方式",
+	"showDefaultKeybindings": "显示默认键绑定",
+	"showUserKeybindings": "显示用户键绑定",
 	"SearchKeybindings.AriaLabel": "搜索键绑定",
 	"SearchKeybindings.Placeholder": "搜索键绑定",
 	"sortByPrecedene": "按优先级排序",
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 8f8fcaf653e..4fc9ae1d616 100644
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "显示下一个搜索包含模式",
 	"previousSearchIncludePattern": "显示上一个搜索包含模式",
-	"nextSearchExcludePattern": "显示下一个搜索排除模式",
-	"previousSearchExcludePattern": "显示上一个搜索排除模式",
 	"nextSearchTerm": "显示下一个搜索词",
 	"previousSearchTerm": "显示上一个搜索词",
 	"showSearchViewlet": "显示搜索",
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchView.i18n.json
index e6d06592621..101ca4d9984 100644
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,9 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "切换搜索详细信息",
-	"searchScope.includes": "要包含的文件",
-	"label.includes": "搜索包含模式",
-	"searchScope.excludes": "要排除的文件",
-	"label.excludes": "搜索排除模式",
+	"searchIncludeExclude.label": "包含或排除的文件",
+	"searchIncludeExclude.ariaLabel": "搜索中包含或排除项的模式",
+	"searchIncludeExclude.placeholder": "例: src, !*.ts, test/**/*.log",
 	"replaceAll.confirmation.title": "全部替换",
 	"replaceAll.confirm.button": "替换(&&R)",
 	"replaceAll.occurrence.file.message": "已将 {1} 文件中出现的 {0} 替换为“{2}”。",
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index a87c2006c20..ba6cda60d7e 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "问题模式或者所提供或预定义问题模式的名称。如果已指定基准，则可以省略。",
 	"ProblemMatcherSchema.base": "要使用的基问题匹配程序的名称。",
 	"ProblemMatcherSchema.owner": "代码内问题的所有者。如果指定了基准，则可省略。如果省略，并且未指定基准，则默认值为“外部”。",
+	"ProblemMatcherSchema.source": "描述此诊断信息来源的人类可读字符串。如，\"typescript\" 或 \"super lint\"。",
 	"ProblemMatcherSchema.severity": "捕获问题的默认严重性。如果模式未定义严重性的匹配组，则使用。",
 	"ProblemMatcherSchema.applyTo": "控制文本文档上报告的问题是否仅应用于打开、关闭或所有文档。",
 	"ProblemMatcherSchema.fileLocation": "定义应如何解释问题模式中报告的文件名。",
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index f4a7949ce43..bb8dcf133ba 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "将任务分配为没有组",
 	"JsonSchema.tasks.group": "定义此任务属于的执行组。它支持 \"build\" 以将其添加到生成组，也支持 \"test\" 以将其添加到测试组。",
 	"JsonSchema.tasks.type": "定义任务是被作为进程运行还是在 shell 中作为命令运行。",
+	"JsonSchema.command.quotedString.value": "实际命令值",
+	"JsonSchema.tasks.quoting.escape": "使用 Shell 的转义字符来转义文本 (如，PowerShell 下的 ` 和 bash 下的 \\ )",
+	"JsonSchema.tasks.quoting.strong": "使用 Shell 的强引用字符来引用参数 (如，在 PowerShell 和 bash 下的 \" )。",
+	"JsonSchema.tasks.quoting.weak": "使用 Shell 的弱引用字符来引用参数 (如，在 PowerShell 和 bash 下的 ' )。",
+	"JsonSchema.command.quotesString.quote": "如何引用命令值。",
+	"JsonSchema.command": "要执行的命令。可以是外部程序或 shell 命令。",
+	"JsonSchema.args.quotedString.value": "实际参数值",
+	"JsonSchema.args.quotesString.quote": "如何引用参数值。",
+	"JsonSchema.tasks.args": "在调用此任务时传递给命令的参数。",
 	"JsonSchema.tasks.label": "任务的用户界面标签",
 	"JsonSchema.version": "配置的版本号。",
 	"JsonSchema.tasks.identifier": "用于在 launch.json 或 dependsOn 子句中引用任务的用户定义标识符。",
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 9a6438ad8f5..b4c4b3ab561 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,11 @@
 	],
 	"tasksCategory": "任务",
 	"ConfigureTaskRunnerAction.label": "配置任务",
-	"problems": "问题",
+	"totalErrors": "{0} 个错误",
+	"totalWarnings": "{0} 条警告",
+	"totalInfos": "{0} 条信息",
 	"building": "正在生成...",
-	"manyMarkers": "99+",
+	"manyProblems": "1万+",
 	"runningTasks": "显示运行中的任务",
 	"tasks": "任务",
 	"TaskSystem.noHotSwap": "在有活动任务运行时更换任务执行引擎需要重新加载窗口",
@@ -46,8 +48,8 @@
 	"recentlyUsed": "最近使用的任务",
 	"configured": "已配置的任务",
 	"detected": "检测到的任务",
-	"TaskService.ignoredFolder": "由于使用任务版本 0.1.0，以下工作区文件夹将被忽略: {0}",
 	"TaskService.notAgain": "不再显示",
+	"TaskService.ignoredFolder": "由于使用任务版本 0.1.0，以下工作区文件夹将被忽略: {0}",
 	"TaskService.pickRunTask": "选择要运行的任务",
 	"TaslService.noEntryToRun": "没有找到要运行的任务。配置任务...",
 	"TaskService.fetchingBuildTasks": "正在获取生成任务...",
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index e9405d899ae..eff1b3e65f3 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "警告: options.cwd 必须属于字符串类型。正在忽略值 {0}\n",
+	"ConfigurationParser.inValidArg": "错误: 命令参数必须是字符串或有效引用的字符串。提供的值为: {0}",
 	"ConfigurationParser.noargs": "错误: 命令参数必须是字符串数组。提供的值为:\n{0}",
 	"ConfigurationParser.noShell": "警告: 仅当在终端中执行任务时支持 shell 配置。",
 	"ConfigurationParser.noName": "错误: 声明范围内的问题匹配程序必须具有名称:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "错误: 任务配置“{0}”缺失必要属性“{1}”。将忽略该任务。",
 	"ConfigurationParser.notCustom": "错误: 任务未声明为自定义任务。将忽略配置。\n{0}\n",
 	"ConfigurationParser.noTaskName": "错误: 任务必须提供 label 属性。将忽略该任务。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: 任务“{0}”是 shell 命令，而且其中一个参数可能含有未转义的空格。若要确保命令行引用正确，请将参数合并到该命令。",
 	"taskConfiguration.noCommandOrDependsOn": "错误：任务“{0}”既不指定命令，也不指定 dependsOn 属性。将忽略该任务。其定义为:\n{1}",
 	"taskConfiguration.noCommand": "错误: 任务“{0}”未定义命令。将忽略该任务。其定义为:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "任务版本 2.0.0 不支持全局操作系统特定任务。请将他们转换为含有操作系统特定命令的任务。受影响的任务有:\n{0}"
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 89fbf231d71..66844979174 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
@@ -51,5 +51,9 @@
 	"workbench.action.terminal.hideFindWidget": "隐藏查找小组件",
 	"nextTerminalFindTerm": "显示下一个搜索结果",
 	"previousTerminalFindTerm": "显示上一个搜索结果",
-	"quickOpenTerm": "切换活动终端"
+	"quickOpenTerm": "切换活动终端",
+	"workbench.action.terminal.focusPreviousCommand": "聚焦于上一条命令",
+	"workbench.action.terminal.focusNextCommand": "聚焦于下一条命令",
+	"workbench.action.terminal.selectToPreviousCommand": "选择上一条命令所有内容",
+	"workbench.action.terminal.selectToNextCommand": "选择下一条命令所有内容"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 243d3f06aeb..074d8bdd681 100644
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "复制",
+	"split": "拆分",
 	"paste": "粘贴",
 	"selectAll": "全选",
-	"clear": "清除",
-	"split": "拆分"
+	"clear": "清除"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..7f372029862
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "发行说明: {0}",
+	"unassigned": "未分配"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 9dda0b0a236..1fcb4a17477 100644
--- a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "稍后",
-	"unassigned": "未分配",
 	"releaseNotes": "发行说明",
 	"showReleaseNotes": "显示发行说明",
 	"read the release notes": "欢迎使用 {0} v{1}! 是否要阅读发布说明?",
diff --git a/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..de275d5e951
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "webview 编辑器"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..4230b0cfc3a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.optOutNotice": "帮助改善 VS Code，允许 Microsoft 收集使用数据。请阅读我们的[隐私声明]({0})并了解如何[选择退出]({1})。",
+	"telemetryOptOut.optInNotice": "帮助改善 VS Code，允许 Microsoft 收集使用数据。请阅读我们的[隐私声明]({0})并了解如何[选择加入]({1})。",
+	"telemetryOptOut.readMore": "了解详细信息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..e28b73aabd5
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "无法在多文件夹工作区中解析 ${workspaceFolder}。使用 : 和文件夹名称来限定此变量的作用域。",
+	"canNotResolveWorkspaceFolder": "无法解析 ${workspaceFolder}。请打开一个文件夹。",
+	"canNotResolveFolderBasenameMultiRoot": "无法在多文件夹工作区中解析 ${workspaceFolderBasename}。使用 : 和文件夹名称来限定此变量的作用域。",
+	"canNotResolveFolderBasename": "无法解析 ${workspaceFolderBasename}。请打开一个文件夹。",
+	"canNotResolveLineNumber": "无法解析 ${lineNumber}。请打开一个编辑器。",
+	"canNotResolveSelectedText": "无法解析 ${selectedText}。请打开一个编辑器。",
+	"canNotResolveFile": "无法解析 ${file}。请打开一个编辑器。",
+	"canNotResolveRelativeFile": "无法解析 ${relativeFile}。请打开一个编辑器。",
+	"canNotResolveFileDirname": "无法解析 ${fileDirname}。请打开一个编辑器。",
+	"canNotResolveFileExtname": "无法解析 ${fileExtname}。请打开一个编辑器。",
+	"canNotResolveFileBasename": "无法解析 ${fileBasename}。请打开一个编辑器。",
+	"canNotResolveFileBasenameNoExtension": "无法解析 ${fileBasenameNoExtension}。请打开一个编辑器。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..e3294fd3329
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "是(&&Y)",
+	"cancelButton": "取消"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 9ffcc94311f..1dd9885b81f 100644
--- a/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,7 @@
 	"neverShowAgain": "不再显示",
 	"netVersionError": "需要 Microsoft .NET Framework 4.5。请访问链接安装它。",
 	"learnMore": "说明",
-	"enospcError": "{0} 的文件句柄已用完。 请按照说明解决此问题。",
+	"enospcError": "{0} 无法监视这个大型工作区的文件变化。请访问说明链接解决此问题。",
 	"binFailed": "未能将“{0}”移动到回收站",
 	"trashFailed": "未能将“{0}”移动到废纸篓"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
index 2f1e460ba31..c2cd87e923e 100644
--- a/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,7 @@
 	"fileInvalidPath": "无效的文件资源({0})",
 	"fileIsDirectoryError": "文件是目录",
 	"fileNotModifiedError": "自以下时间未修改的文件:",
-	"fileTooLargeForHeapError": "文件大小超过窗口内存限制，请尝试运行 code --max-memory=[新的大小]",
+	"fileTooLargeForHeapError": "文件大小超过默认内存限制。您可以使用更高的限制重新启动，当前限制为 {0}MB",
 	"fileTooLargeError": "文件太大，无法打开",
 	"fileNotFoundError": "找不到文件({0})",
 	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
diff --git a/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..2ac63294841 100644
--- a/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "取消"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 4a5227e1f24..b3351c5e331 100644
--- a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 文件所用的 textmate 范围名称。",
 	"vscode.extension.contributes.grammars.path": "tmLanguage 文件的路径。该路径是相对于扩展文件夹，通常以 \"./syntaxes/\" 开头。",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此语法包含嵌入式语言，则为作用域名称到语言 ID 的映射。",
+	"vscode.extension.contributes.grammars.tokenTypes": "从作用域名到标记类型的映射。",
 	"vscode.extension.contributes.grammars.injectTo": "此语法注入到的语言范围名称列表。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 8d7273e1ad7..47ffc41e0ba 100644
--- a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
 	"invalid.injectTo": "\"contributes.{0}.injectTo\" 中的值无效。必须为语言范围名称数组。提供的值: {1}",
 	"invalid.embeddedLanguages": "\"contributes.{0}.embeddedLanguages\" 中的值无效。必须为从作用域名称到语言的对象映射。提供的值: {1}",
+	"invalid.tokenTypes": "“contributes.{0}.tokenTypes”的值无效。其必须为从作用域名到标记类型的对象映射。当前值: {1}",
 	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
 	"no-tm-grammar": "没有注册这种语言的 TM 语法。"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..8d5e76dfac0
--- /dev/null
+++ b/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "CSS 語言伺服器",
+	"folding.start": "摺疊區域開始",
+	"folding.end": "摺疊區域結束"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css-language-features/package.i18n.json b/i18n/cht/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..d40f448f342
--- /dev/null
+++ b/i18n/cht/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "CSS 語言功能",
+	"description": "為 CSS, LESS 和 SCSS 檔案提供豐富的語言支援 ",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
+	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
+	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
+	"css.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
+	"css.lint.emptyRules.desc": "請勿使用空白規則集",
+	"css.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
+	"css.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
+	"css.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
+	"css.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
+	"css.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
+	"css.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
+	"css.lint.importStatement.desc": "匯入陳述式不會平行載入",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
+	"css.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
+	"css.lint.unknownProperties.desc": "未知的屬性。",
+	"css.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
+	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
+	"css.lint.zeroUnits.desc": "零不需要任何單位",
+	"css.trace.server.desc": "追蹤 VS Code 與 CSS 語言伺服器之間的通訊。",
+	"css.validate.title": "控制 CSS 驗證與問題嚴重性。",
+	"css.validate.desc": "啟用或停用所有驗證",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
+	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
+	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
+	"less.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
+	"less.lint.emptyRules.desc": "請勿使用空白規則集",
+	"less.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
+	"less.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
+	"less.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
+	"less.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
+	"less.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
+	"less.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
+	"less.lint.importStatement.desc": "匯入陳述式不會平行載入",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
+	"less.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
+	"less.lint.unknownProperties.desc": "未知的屬性。",
+	"less.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
+	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
+	"less.lint.zeroUnits.desc": "零不需要任何單位",
+	"less.validate.title": "控制 LESS 驗證與問題嚴重性。",
+	"less.validate.desc": "啟用或停用所有驗證",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
+	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
+	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
+	"scss.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
+	"scss.lint.emptyRules.desc": "請勿使用空白規則集",
+	"scss.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
+	"scss.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
+	"scss.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
+	"scss.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
+	"scss.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
+	"scss.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
+	"scss.lint.importStatement.desc": "匯入陳述式不會平行載入",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
+	"scss.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
+	"scss.lint.unknownProperties.desc": "未知的屬性。",
+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
+	"scss.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
+	"scss.lint.zeroUnits.desc": "零不需要任何單位",
+	"scss.validate.title": "控制 SCSS 驗證與問題嚴重性。",
+	"scss.validate.desc": "啟用或停用所有驗證",
+	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css/package.i18n.json b/i18n/cht/extensions/css/package.i18n.json
index d40f448f342..35229bd6699 100644
--- a/i18n/cht/extensions/css/package.i18n.json
+++ b/i18n/cht/extensions/css/package.i18n.json
@@ -5,77 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "CSS 語言功能",
-	"description": "為 CSS, LESS 和 SCSS 檔案提供豐富的語言支援 ",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"css.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"css.lint.emptyRules.desc": "請勿使用空白規則集",
-	"css.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"css.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"css.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"css.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"css.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"css.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"css.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"css.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"css.lint.unknownProperties.desc": "未知的屬性。",
-	"css.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"css.lint.zeroUnits.desc": "零不需要任何單位",
-	"css.trace.server.desc": "追蹤 VS Code 與 CSS 語言伺服器之間的通訊。",
-	"css.validate.title": "控制 CSS 驗證與問題嚴重性。",
-	"css.validate.desc": "啟用或停用所有驗證",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"less.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"less.lint.emptyRules.desc": "請勿使用空白規則集",
-	"less.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"less.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"less.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"less.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"less.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"less.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"less.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"less.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"less.lint.unknownProperties.desc": "未知的屬性。",
-	"less.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"less.lint.zeroUnits.desc": "零不需要任何單位",
-	"less.validate.title": "控制 LESS 驗證與問題嚴重性。",
-	"less.validate.desc": "啟用或停用所有驗證",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"scss.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"scss.lint.emptyRules.desc": "請勿使用空白規則集",
-	"scss.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"scss.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"scss.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"scss.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"scss.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"scss.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"scss.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"scss.lint.unknownProperties.desc": "未知的屬性。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"scss.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"scss.lint.zeroUnits.desc": "零不需要任何單位",
-	"scss.validate.title": "控制 SCSS 驗證與問題嚴重性。",
-	"scss.validate.desc": "啟用或停用所有驗證",
-	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。"
+	]
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/emmet/package.i18n.json b/i18n/cht/extensions/emmet/package.i18n.json
index 660a269c068..b356553fff9 100644
--- a/i18n/cht/extensions/emmet/package.i18n.json
+++ b/i18n/cht/extensions/emmet/package.i18n.json
@@ -59,5 +59,6 @@
 	"emmetPreferencesCssWebkitProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'webkit' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'webkit' 前綴。",
 	"emmetPreferencesCssMozProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'moz' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'moz' 前綴。",
 	"emmetPreferencesCssOProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'o' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'o' 前綴。",
-	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。"
+	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
+	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/commands.i18n.json b/i18n/cht/extensions/git/out/commands.i18n.json
index e25ea2cf781..b7d543af3f2 100644
--- a/i18n/cht/extensions/git/out/commands.i18n.json
+++ b/i18n/cht/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "確定",
 	"push with tags success": "已成功使用標籤推送。",
 	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
-	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
+	"sync is unpredictable": "此動作會推送認可至`{0}/{1}`並從中提取認可。",
 	"never again": "確定，不要再顯示",
 	"no remotes to publish": "您的儲存庫未設定要發行的遠端目標。",
 	"no changes stash": "沒有變更可供隱藏。",
diff --git a/i18n/cht/extensions/git/package.i18n.json b/i18n/cht/extensions/git/package.i18n.json
index 044a69ec71a..bc042cb15d8 100644
--- a/i18n/cht/extensions/git/package.i18n.json
+++ b/i18n/cht/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "控制是否在Git變更列表中的檔名旁顯示“開啟檔案”的動作按鈕。",
 	"config.inputValidation": "控制何時顯示認可訊息輸入驗證。",
 	"config.detectSubmodules": "控制是否自動偵測 Git 子模組。",
+	"config.detectSubmodulesLimit": "控制 Git 子模組的偵測限制",
 	"colors.modified": "修改資源的顏色。",
 	"colors.deleted": "刪除資源的顏色",
 	"colors.untracked": "未追蹤資源的顏色。",
diff --git a/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..0c001145a7a
--- /dev/null
+++ b/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "HTML 語言伺服器",
+	"folding.start": "摺疊區域開始",
+	"folding.end": "摺疊區域結束"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html-language-features/package.i18n.json b/i18n/cht/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..d83d91cc72a
--- /dev/null
+++ b/i18n/cht/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML 語言功能",
+	"description": "為 HTML、Razor 及 Handlebars 檔案提供豐富的語言支援。",
+	"html.format.enable.desc": "啟用/停用預設 HTML 格式器",
+	"html.format.wrapLineLength.desc": "每行的字元數上限 (0 = 停用)。",
+	"html.format.unformatted.desc": "不應重新格式化的逗號分隔標記清單。'null' 預設為 https://www.w3.org/TR/html5/dom.html#phrasing-content 中列出的所有標記。",
+	"html.format.contentUnformatted.desc": "逗點分隔的標記清單，其中內容的格式不應重新設定。'null' 預設為 'pre' 標記。",
+	"html.format.indentInnerHtml.desc": "縮排 <head> 及 <body> 區段。",
+	"html.format.preserveNewLines.desc": "是否應保留項目前方現有的分行符號。僅適用於項目前方，而不適用於標記內或文字。",
+	"html.format.maxPreserveNewLines.desc": "一個區塊要保留的最大分行符號數。使用 'null' 表示無限制。",
+	"html.format.indentHandlebars.desc": "格式化並縮排 {{#foo}} 及 {{/foo}}。",
+	"html.format.endWithNewline.desc": "以新行字元結尾。",
+	"html.format.extraLiners.desc": "前方應有額外新行字元的標記清單，須以逗號分隔。'null' 的預設值為 \"head, body, /html\"。",
+	"html.format.wrapAttributes.desc": "將屬性換行。",
+	"html.format.wrapAttributes.auto": "只在超過行的長度時將屬性換行。",
+	"html.format.wrapAttributes.force": "將第一個以外的每個屬性換行。",
+	"html.format.wrapAttributes.forcealign": "將第一個以外的每個屬性換行，並保持對齊。",
+	"html.format.wrapAttributes.forcemultiline": "將每個屬性換行。",
+	"html.suggest.angular1.desc": "設定內建 HTML 語言支援是否建議 Angular V1 標記和屬性。",
+	"html.suggest.ionic.desc": "設定內建 HTML 語言支援是否建議 Ionic 標記、屬性和值。",
+	"html.suggest.html5.desc": "設定內建 HTML 語言支援是否建議 HTML5 標記、屬性和值。",
+	"html.trace.server.desc": "追蹤 VS Code 與 HTML  語言伺服器之間的通訊。",
+	"html.validate.scripts": "設定內建 HTML 語言支援是否會驗證內嵌指定碼。",
+	"html.validate.styles": "設定內建 HTML 語言支援是否會驗證內嵌樣式。",
+	"html.autoClosingTags": "啟用/停用 HTML 標籤的自動關閉功能。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html/package.i18n.json b/i18n/cht/extensions/html/package.i18n.json
index d120f92d827..35229bd6699 100644
--- a/i18n/cht/extensions/html/package.i18n.json
+++ b/i18n/cht/extensions/html/package.i18n.json
@@ -5,30 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "HTML 語言功能",
-	"description": "為 HTML、Razor 及 Handlebars 檔案提供豐富的語言支援。",
-	"html.format.enable.desc": "啟用/停用預設 HTML 格式器",
-	"html.format.wrapLineLength.desc": "每行的字元數上限 (0 = 停用)。",
-	"html.format.unformatted.desc": "不應重新格式化的逗號分隔標記清單。'null' 預設為 https://www.w3.org/TR/html5/dom.html#phrasing-content 中列出的所有標記。",
-	"html.format.contentUnformatted.desc": "逗點分隔的標記清單，其中內容的格式不應重新設定。'null' 預設為 'pre' 標記。",
-	"html.format.indentInnerHtml.desc": "縮排 <head> 及 <body> 區段。",
-	"html.format.preserveNewLines.desc": "是否應保留項目前方現有的分行符號。僅適用於項目前方，而不適用於標記內或文字。",
-	"html.format.maxPreserveNewLines.desc": "一個區塊要保留的最大分行符號數。使用 'null' 表示無限制。",
-	"html.format.indentHandlebars.desc": "格式化並縮排 {{#foo}} 及 {{/foo}}。",
-	"html.format.endWithNewline.desc": "以新行字元結尾。",
-	"html.format.extraLiners.desc": "前方應有額外新行字元的標記清單，須以逗號分隔。'null' 的預設值為 \"head, body, /html\"。",
-	"html.format.wrapAttributes.desc": "將屬性換行。",
-	"html.format.wrapAttributes.auto": "只在超過行的長度時將屬性換行。",
-	"html.format.wrapAttributes.force": "將第一個以外的每個屬性換行。",
-	"html.format.wrapAttributes.forcealign": "將第一個以外的每個屬性換行，並保持對齊。",
-	"html.format.wrapAttributes.forcemultiline": "將每個屬性換行。",
-	"html.suggest.angular1.desc": "設定內建 HTML 語言支援是否建議 Angular V1 標記和屬性。",
-	"html.suggest.ionic.desc": "設定內建 HTML 語言支援是否建議 Ionic 標記、屬性和值。",
-	"html.suggest.html5.desc": "設定內建 HTML 語言支援是否建議 HTML5 標記、屬性和值。",
-	"html.trace.server.desc": "追蹤 VS Code 與 HTML  語言伺服器之間的通訊。",
-	"html.validate.scripts": "設定內建 HTML 語言支援是否會驗證內嵌指定碼。",
-	"html.validate.styles": "設定內建 HTML 語言支援是否會驗證內嵌樣式。",
-	"html.experimental.syntaxFolding": "啟用/停用語法感知摺疊標記。",
-	"html.autoClosingTags": "啟用/停用 HTML 標籤的自動關閉功能。"
+	]
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..275d7ba3cb0
--- /dev/null
+++ b/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "JSON 語言伺服器"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json-language-features/package.i18n.json b/i18n/cht/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..15eaaf64aef
--- /dev/null
+++ b/i18n/cht/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "JSON 語言功能",
+	"description": "為 JSON 檔案提供豐富的語言支援",
+	"json.schemas.desc": "在結構描述與目前專案的 JSON 檔案之間建立關聯",
+	"json.schemas.url.desc": "目前目錄中的結構描述 URL 或結構描述相對路徑",
+	"json.schemas.fileMatch.desc": "檔案模式陣列，在將 JSON 檔案解析成結構描述時的比對對象。",
+	"json.schemas.fileMatch.item.desc": "可包含 '*' 的檔案模式，在將 JSON 檔案解析成結構描述時的比對對象。",
+	"json.schemas.schema.desc": "指定 URL 的結構描述定義。只須提供結構描述以避免存取結構描述 URL。",
+	"json.format.enable.desc": "啟用/停用預設 JSON 格式器 (需要重新啟動)",
+	"json.tracing.desc": "追蹤 VS Code 與 JSON 語言伺服器之間的通訊。",
+	"json.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` 已淘汰，將改為 `editor.colorDecorators`。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json/package.i18n.json b/i18n/cht/extensions/json/package.i18n.json
index b0012a5af6c..35229bd6699 100644
--- a/i18n/cht/extensions/json/package.i18n.json
+++ b/i18n/cht/extensions/json/package.i18n.json
@@ -5,17 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "JSON 語言功能",
-	"description": "為 JSON 檔案提供豐富的語言支援",
-	"json.schemas.desc": "在結構描述與目前專案的 JSON 檔案之間建立關聯",
-	"json.schemas.url.desc": "目前目錄中的結構描述 URL 或結構描述相對路徑",
-	"json.schemas.fileMatch.desc": "檔案模式陣列，在將 JSON 檔案解析成結構描述時的比對對象。",
-	"json.schemas.fileMatch.item.desc": "可包含 '*' 的檔案模式，在將 JSON 檔案解析成結構描述時的比對對象。",
-	"json.schemas.schema.desc": "指定 URL 的結構描述定義。只須提供結構描述以避免存取結構描述 URL。",
-	"json.format.enable.desc": "啟用/停用預設 JSON 格式器 (需要重新啟動)",
-	"json.tracing.desc": "追蹤 VS Code 與 JSON 語言伺服器之間的通訊。",
-	"json.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` 已淘汰，將改為 `editor.colorDecorators`。",
-	"json.experimental.syntaxFolding": "啟用/停用語法感知折疊標記。"
+	]
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..2f489d0fef5
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "無法載入 ‘markdown.style' 樣式:{0}"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..74c6cf18168
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[預覽] {0}",
+	"previewTitle": "預覽 [0]"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..fe1f5c5a4e5
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "此文件中的部分內容已停用",
+	"preview.securityMessage.title": "Markdown 預覽中已停用可能不安全或不安全的內容。請將 Markdown 預覽的安全性設定變更為允許不安全內容，或啟用指令碼",
+	"preview.securityMessage.label": "內容已停用安全性警告"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/security.i18n.json b/i18n/cht/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..cc4260be39f
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "嚴謹",
+	"strict.description": "僅載入安全內容",
+	"insecureContent.title": "允許不安全的內容",
+	"insecureContent.description": "啟用 http 載入內容",
+	"disable.title": "停用",
+	"disable.description": "允許所有內容與指令碼執行。不建議",
+	"moreInfo.title": "詳細資訊",
+	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
+	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
+	"toggleSecurityWarning.description": "不影響內容安全性層級",
+	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/package.i18n.json b/i18n/cht/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..d27fa896c2a
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Markdown 語言功能",
+	"description": "為 Markdown 提供豐富的語言支援。",
+	"markdown.preview.breaks.desc": "設定在 Markdown 預覽中如何顯示分行符號。設為 'trure' 為每個新行建立<br>",
+	"markdown.preview.linkify": "啟用或停用在 Markdown 預覽中將類似 URL 的文字轉換為連結。",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 預覽中按兩下會切換到編輯器。",
+	"markdown.preview.fontFamily.desc": "控制 Markdown 預覽中使用的字型家族。",
+	"markdown.preview.fontSize.desc": "控制 Markdown 預覽中使用的字型大小 (以像素為單位)。",
+	"markdown.preview.lineHeight.desc": "控制 Markdown 預覽中使用的行高。此數字相對於字型大小。",
+	"markdown.preview.markEditorSelection.desc": "在 Markdown 預覽中標記目前的編輯器選取範圍。",
+	"markdown.preview.scrollEditorWithPreview.desc": "在捲動 Markdown 預覽時更新編輯器的檢視。",
+	"markdown.preview.scrollPreviewWithEditor.desc": "在捲動 Markdown 編輯器時更新預覽的檢視。",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[已淘汰] 捲動 Markdown 預覽，以從編輯器顯示目前選取的程式行。",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此設定已由 'markdown.preview.scrollPreviewWithEditor' 取代，不再具有任何效果。",
+	"markdown.preview.title": "開啟預覽",
+	"markdown.previewFrontMatter.dec": "設定 YAML 前端在 Markdown 預覽中呈現的方式。[隱藏] 會移除前端。否則，前端會視為 Markdown 內容。",
+	"markdown.previewSide.title": "在一側開啟預覽",
+	"markdown.showLockedPreviewToSide.title": "在側面開啟鎖定的預覽",
+	"markdown.showSource.title": "顯示來源",
+	"markdown.styles.dec": "可從 Markdown 預覽使用之 CSS 樣式表的 URL 或本機路徑清單。相對路徑是相對於在總管中開啟的資料夾來進行解釋。若沒有開啟資料夾，路徑則是相對於 Markdown 檔案的位置來進行解釋。所有 '\\' 都必須寫成 '\\\\'。",
+	"markdown.showPreviewSecuritySelector.title": "變更預覽的安全性設定",
+	"markdown.trace.desc": "允許 Markdown 延伸模組進行偵錯記錄。",
+	"markdown.preview.refresh.title": "重新整理預覽",
+	"markdown.preview.toggleLock.title": "切換預覽鎖定"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..62153a9c2da
--- /dev/null
+++ b/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "要允許 {0} (定義為工作區設定) 執行，以使用 lint 標記 PHP 檔案嗎?",
+	"php.yes": "允許",
+	"php.no": "不允許",
+	"wrongExecutable": "因為 {0} 不是有效的 PHP 可執行檔，所以無法驗證。您可以使用設定 'php.validate.executablePath' 設定 PHP 可執行檔。",
+	"noExecutable": "因為未設定任何 PHP 可執行檔，所以無法驗證。您可以使用 'php.validate.executablePath'  設定可執行檔。",
+	"unknownReason": "無法使用路徑 {0} 執行 PHP。原因不明。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php-language-features/package.i18n.json b/i18n/cht/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..abe5dfe9ea4
--- /dev/null
+++ b/i18n/cht/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "設定是否啟用內建 PHP 語言建議。此支援會建議 PHP 全域和變數。",
+	"configuration.validate.enable": "啟用/停用內建 PHP 驗證。",
+	"configuration.validate.executablePath": "指向 PHP 可執行檔。",
+	"configuration.validate.run": "是否在儲存或輸入時執行 linter。",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "禁止 PHP 驗證可執行檔 (定義為工作區設定)",
+	"displayName": "PHP 語言功能",
+	"description": "為 PHP 檔案提供豐富的語言支援。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php/package.i18n.json b/i18n/cht/extensions/php/package.i18n.json
index 397c38b737e..0b1d70297e1 100644
--- a/i18n/cht/extensions/php/package.i18n.json
+++ b/i18n/cht/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "設定是否啟用內建 PHP 語言建議。此支援會建議 PHP 全域和變數。",
-	"configuration.validate.enable": "啟用/停用內建 PHP 驗證。",
-	"configuration.validate.executablePath": "指向 PHP 可執行檔。",
-	"configuration.validate.run": "是否在儲存或輸入時執行 linter。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "禁止 PHP 驗證可執行檔 (定義為工作區設定)",
-	"displayName": "PHP 語言功能",
-	"description": "為 PHP 檔案提供 IntelliSense、Lint 支援及語言基礎知識。"
+	"displayName": "PHP 語言功能"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 04261af3234..a2daae312b9 100644
--- a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "找不到結果",
 	"settingsSearchIssue": "設定值搜尋問題",
 	"bugReporter": "臭蟲回報",
-	"performanceIssue": "效能問題",
 	"featureRequest": "功能要求",
+	"performanceIssue": "效能問題",
 	"stepsToReproduce": "重現的步驟",
 	"bugDescription": "請共用必要步驟以確實複製問題。請包含實際與預期的結果。我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
 	"performanceIssueDesciption": "效能問題的發生時間點為何? 問題是在啟動或經過一組特定動作後發生的? 我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 上進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
diff --git a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 67c4e506a0f..0dd95be0c2c 100644
--- a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,6 @@
 	"warningBorder": "編輯器內警告提示線的邊框色彩.",
 	"infoForeground": "編輯器內資訊提示線的前景色彩",
 	"infoBorder": "編輯器內資訊提示線的邊框色彩",
-	"overviewRulerRangeHighlight": "範圍醒目提示的概觀尺規標記色彩。",
 	"overviewRuleError": "錯誤的概觀尺規標記色彩。",
 	"overviewRuleWarning": "警示的概觀尺規標記色彩。",
 	"overviewRuleInfo": "資訊的概觀尺規標記色彩。"
diff --git a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index ad654fda54a..c7f226e111b 100644
--- a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "移至下一個問題 (錯誤, 警告, 資訊)",
-	"markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)",
-	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
-	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
-	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
-	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
+	"markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..11b5e18ff6c
--- /dev/null
+++ b/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
+	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
+	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
+	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..5fc5a3e66a6
--- /dev/null
+++ b/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,40 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"Sunday": "星期日",
+	"Monday": "星期一",
+	"Tuesday": "星期二",
+	"Wednesday": "星期三",
+	"Thursday": "星期四",
+	"Friday": "星期五",
+	"Saturday": "星期六",
+	"January": "1月",
+	"February": "2月",
+	"March": "3月",
+	"April": "4月",
+	"May": "5月",
+	"June": "6月",
+	"July": "7月",
+	"August": "8月",
+	"September": "9月",
+	"October": "10月",
+	"November": "11月",
+	"December": "12月",
+	"JanuaryShort": "1月",
+	"FebruaryShort": "2月",
+	"MarchShort": "3月",
+	"AprilShort": "4月",
+	"MayShort": "5月",
+	"JuneShort": "6月",
+	"JulyShort": "7月",
+	"AugustShort": "8月",
+	"SeptemberShort": "9月",
+	"OctoberShort": "10月",
+	"NovemberShort": "11月",
+	"DecemberShort": "12月"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 1cee9b500bb..c903408c5fd 100644
--- a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,6 @@
 	"wordHighlightStrong": "寫入存取符號時的背景顏色，如寫入變數。不能使用非透明的顏色來隱藏底層的樣式。",
 	"wordHighlightBorder": "讀取存取期間 (例如讀取變數時) 符號的邊框顏色。",
 	"wordHighlightStrongBorder": "寫入存取期間 (例如寫入變數時) 符號的邊框顏色。 ",
-	"overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。",
-	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。",
 	"wordHighlight.next.label": "移至下一個反白符號",
 	"wordHighlight.previous.label": "移至上一個反白符號"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..3b2a2f318b6
--- /dev/null
+++ b/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...另外 1 個檔案未顯示",
+	"moreFiles": "...另外 {0} 個檔案未顯示"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..7667b941599
--- /dev/null
+++ b/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "取消"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 01f556d1f68..3faa343fdfd 100644
--- a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,14 @@
 	"errorInstallingDependencies": "安裝相依套件時發生錯誤。{0}",
 	"MarketPlaceDisabled": "未啟用市集",
 	"removeError": "移除擴充功能: {0} 時發生錯誤。重新嘗試前請離開並再次啟動 VS Code。",
-	"Not Market place extension": "只有市集擴充功能可以重新安裝",
+	"Not a Marketplace extension": "只有市集擴充功能可以重新安裝",
 	"notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。",
 	"malicious extension": "因為有使用者回報該延伸模組有問題，所以無法安裝延伸模組。",
 	"notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。",
 	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
 	"exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。",
 	"uninstallDependeciesConfirmation": "只要將 '{0}' 解除安裝，或要包含其相依性?",
-	"uninstallOnly": "只有",
-	"uninstallAll": "全部",
+	"uninstallAll": "全部解除安裝",
 	"uninstallConfirmation": "確定要將 '{0}' 解除安裝嗎?",
 	"ok": "確定",
 	"singleDependentError": "無法將延伸模組 '{0}' 解除安裝。其為延伸模組 '{1}' 的相依對象。",
diff --git a/i18n/cht/src/vs/platform/list/browser/listService.i18n.json b/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
index e9ebd5685ed..16ce88704c4 100644
--- a/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "透過滑鼠多選，用於在樹狀目錄與清單中新增項目的輔助按鍵 (例如在總管中開啟 [編輯器] 及 [SCM] 檢視)。在 Windows 及 Linux 上，`ctrlCmd` 對應 `Control`，在 macOS 上則對應 `Command`。[在側邊開啟] 滑鼠手勢 (若支援) 將會適應以避免和多選輔助按鍵衝突。",
 	"openMode.singleClick": "以滑鼠按一下開啟項目。",
 	"openMode.doubleClick": "以滑鼠按兩下開啟項目。",
-	"openModeModifier": "控制如何使用滑鼠在樹狀目錄與清單中開啟項目 (若有支援)。設為 `singleClick` 可以滑鼠按一下開啟物件，設為 `doubleClick` 則只能透過按兩下滑鼠開啟物件。對於樹狀目錄中具子系的父系而言，此設定會控制應以滑鼠按一下或按兩下展開父系。注意，某些樹狀目錄或清單若不適用此設定則會予以忽略。"
+	"openModeModifier": "控制如何使用滑鼠在樹狀目錄與清單中開啟項目 (若有支援)。設為 `singleClick` 可以滑鼠按一下開啟物件，設為 `doubleClick` 則只能透過按兩下滑鼠開啟物件。對於樹狀目錄中具子系的父系而言，此設定會控制應以滑鼠按一下或按兩下展開父系。注意，某些樹狀目錄或清單若不適用此設定則會予以忽略。",
+	"horizontalScrolling setting": "控制是否支援工作台中的水平滾動。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/markers/common/markers.i18n.json b/i18n/cht/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..cd4eb5c86cf
--- /dev/null
+++ b/i18n/cht/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "錯誤",
+	"sev.warning": "警告",
+	"sev.info": "資訊"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
index ba572d1fad3..7117ed7c722 100644
--- a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -92,7 +92,5 @@
 	"mergeBorder": "內嵌合併衝突中標頭及分隔器的邊界色彩。",
 	"overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。",
 	"overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。",
-	"overviewRulerCommonContentForeground": "內嵌合併衝突中的共同上階概觀尺規前景。",
-	"overviewRulerFindMatchForeground": "尋找比對的概觀尺規標記色彩。",
-	"overviewRulerSelectionHighlightForeground": "選取項目醒目提示的概觀尺規標記色彩。"
+	"overviewRulerCommonContentForeground": "內嵌合併衝突中的共同上階概觀尺規前景。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..950340ccaf2
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"extensionSource": "{0} (延伸模組)"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 01f9e8f017f..9af81e350d6 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "聚焦下一個群組",
 	"openToSide": "開至側邊",
 	"closeEditor": "關閉編輯器",
+	"closeOneEditor": "關閉",
 	"revertAndCloseActiveEditor": "還原並關閉編輯器",
 	"closeEditorsToTheLeft": "將編輯器關到左側",
 	"closeAllEditors": "關閉所有編輯器",
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index bd46f839ef8..47f703cf2f9 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "關閉",
 	"araLabelEditorActions": "編輯器動作"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 87b4e30eb9d..57cd7f56821 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "尚無新通知",
 	"notifications": "通知",
 	"notificationsToolbar": "通知中心動作",
 	"notificationsList": "通知列表"
diff --git a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 7f571b29a98..f8343577d89 100644
--- a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,12 @@
 	"windowConfigurationTitle": "視窗",
 	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
 	"window.openFilesInNewWindow.off": "檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
-	"window.openFilesInNewWindow.default": "除非從擴充座或 Finder 中開啟，否則檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟 (僅限 macOS)",
-	"openFilesInNewWindow": "控制檔案是否應在新視窗中開啟。\n- default: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟，除非透過擴充座或從尋找工具開啟 (僅限 macOS)\n- on: 檔案會在新視窗開啟\n- off: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
 	"window.openFoldersInNewWindow.on": "資料夾會在新視窗中開啟",
 	"window.openFoldersInNewWindow.off": "資料夾會取代上一個使用中的視窗",
 	"window.openFoldersInNewWindow.default": "除非已從應用程式內挑選了資料夾 (例如透過 [檔案] 功能表)，否則資料夾會在新視窗中開啟",
 	"openFoldersInNewWindow": "控制資料夾應在新視窗中開啟或取代上一個使用中的視窗。\n- default: 除非已從應用程式內挑選資料夾 (例如，透過 [檔案] 功能表)，否則會在新視窗開啟\n- on: 資料夾會在新視窗開啟\n- off: 資料夾會取代上一個使用中視窗\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
+	"window.openWithoutArgumentsInNewWindow.on": "開啟新空白視窗",
+	"window.openWithoutArgumentsInNewWindow.off": "聚焦在上一個正在運行的執行個體",
 	"window.reopenFolders.all": "重新開啟所有視窗。",
 	"window.reopenFolders.folders": "重新開啟所有資料夾。空白工作區將不會還原。",
 	"window.reopenFolders.one": "重新開啟上一個使用中的視窗。",
@@ -58,7 +58,6 @@
 	"restoreWindows": "控制重新啟動後視窗重新開啟的方式。選取 [無] 一律以空白工作區開始、選取 [一] 從上一個編輯的視窗重新開啟、選取 [資料夾] 重新開啟所有資料夾曾經開啟的視窗，或選取 [全部] 重新開啟上一個工作階段的所有視窗。",
 	"restoreFullscreen": "控制當視窗在全螢幕模式下結束後，下次是否仍以全螢幕模式開啟。",
 	"zoomLevel": "調整視窗的縮放比例。原始大小為 0，而且每個向上增量 (例如 1) 或向下增量 (例如 -1) 代表放大或縮小 20%。您也可以輸入小數，更細微地調整縮放比例。",
-	"title": "依據使用中的編輯器控制視窗標題。變數會依據內容替換:\n${activeEditorShort}: 檔案名稱 (例如 myFile.txt)\n${activeEditorMedium}: 與工作區資料夾相關的檔案路徑 (例如 myFolder/myFile.txt)\n${activeEditorLong}: 完整的檔案路徑 (例如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 包含著資料夾之工作區資料夾的名稱 (例如 myFolder)\n${folderPath}: 包含著資料夾之工作區資料夾的檔案路徑 (例如 /Users/Development/myFolder)\n${rootName}: 工作區的名稱 (例如 myFolder 或 myWorkspace)\n${rootPath}: 工作區的檔案路徑 (例如 /Users/Development/myWorkspace)\n${appName}: 例如 VS Code\n${dirty}: 已變更指示 (若使用中編輯器已變更)\n${separator}: 僅在受具有值之變數括住時才顯示的條件式分隔符號 (\" - \")",
 	"window.newWindowDimensions.default": "在螢幕中央開啟新視窗。",
 	"window.newWindowDimensions.inherit": "以相同於上一個使用中之視窗的維度開啟新視窗。",
 	"window.newWindowDimensions.maximized": "開啟並最大化新視窗。",
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index f2e740a82b9..0f2f7956622 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "重新啟動框架",
 	"removeBreakpoint": "移除中斷點",
 	"removeAllBreakpoints": "移除所有中斷點",
-	"enableBreakpoint": "啟用中斷點",
-	"disableBreakpoint": "停用中斷點",
 	"enableAllBreakpoints": "啟用所有中斷點",
 	"disableAllBreakpoints": "停用所有中斷點",
 	"activateBreakpoints": "啟動中斷點",
 	"deactivateBreakpoints": "停用中斷點",
 	"reapplyAllBreakpoints": "重新套用所有中斷點",
 	"addFunctionBreakpoint": "加入函式中斷點",
-	"addConditionalBreakpoint": "新增條件中斷點...",
-	"editConditionalBreakpoint": "編輯中斷點...",
 	"setValue": "設定值",
 	"addWatchExpression": "加入運算式",
 	"editWatchExpression": "編輯運算式",
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..314e9cddf9c
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
+	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
+	"breakpointWidgetHitCountAriaLabel": "程式只會在符合叫用次數時於此處停止。按 Enter 鍵接受，或按 Escape 鍵取消。",
+	"breakpointWidgetAriaLabel": "程式只有在此條件為 true 時才會在此停止。請按 Enter 鍵接受，或按 Esc 鍵取消。",
+	"expression": "運算式",
+	"hitCount": "叫用次數"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 0eb51f5a0eb..21124f7d54b 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "編輯中斷點...",
+	"disableBreakpoint": "停用中斷點",
+	"enableBreakpoint": "啟用中斷點",
 	"removeBreakpoints": "移除中斷點",
 	"removeBreakpointOnColumn": "移除資料行 {0} 的中斷點",
 	"removeLineBreakpoint": "移除行中斷點",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "啟用資料行 {0} 的中斷點",
 	"enableBreakpointOnLine": "啟用行中斷點",
 	"addBreakpoint": "加入中斷點",
+	"conditionalBreakpoint": "新增條件中斷點...",
 	"addConfiguration": "新增組態..."
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index b104866a55b..a922616389e 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "顯示錯誤",
 	"noFolderWorkspaceDebugError": "無法對使用中的檔案偵錯。請確認檔案已儲存在磁碟上，而且您已經為該檔案類型安裝偵錯延伸模組。",
 	"cancel": "取消",
-	"DebugTaskNotFound": "找不到 preLaunchTask '{0}'。",
-	"taskNotTracked": "無法追蹤 preLaunchTask '{0}'。"
+	"DebugTaskNotFound": "找不到工作 \"{0}\"。",
+	"taskNotTracked": "無法追蹤工作 '{0}'。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index f678d3e4041..5709df0fdf0 100644
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,7 @@
 	"configureWorkspaceFolderRecommendedExtensions": "設定建議的延伸模組 (工作區資料夾) ",
 	"malicious tooltip": "這個延伸模組曾經被回報是有問題的。",
 	"malicious": "惡意",
+	"disabled workspace": "在此工作區停用",
 	"disableAll": "停用所有已安裝的延伸模組",
 	"disableAllWorkspace": "停用此工作區的所有已安裝延伸模組",
 	"enableAll": "啟用所有擴充功能",
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..0f0a8bc1904
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "延伸模組名稱",
+	"extension id": "延伸模組識別碼",
+	"preview": "預覽",
+	"builtin": "內建",
+	"publisher": "發行者名稱",
+	"install count": "安裝計數",
+	"rating": "評等",
+	"repository": "儲存庫",
+	"license": "授權",
+	"details": "詳細資料",
+	"contributions": "貢獻",
+	"changelog": "變更記錄",
+	"dependencies": "相依性",
+	"noReadme": "沒有可用的讀我檔案。",
+	"noChangelog": "沒有可用的 Changelog。",
+	"noContributions": "沒有比重",
+	"noDependencies": "沒有相依性",
+	"settings": "設定 ({0})",
+	"setting name": "名稱",
+	"description": "描述",
+	"default": "預設",
+	"debuggers": "偵錯工具 ({0})",
+	"debugger name": "名稱",
+	"debugger type": "型別",
+	"views": "瀏覽次數 ({0})",
+	"view id": "識別碼",
+	"view name": "名稱",
+	"view location": "位置",
+	"localizations": "當地語系化 ({0})",
+	"localizations language id": "語言識別碼",
+	"localizations language name": "語言名稱",
+	"localizations localized language name": "語言名稱 (在地化)",
+	"colorThemes": "色彩佈景主題 ({0})",
+	"iconThemes": "圖示佈景主題 ({0}) ",
+	"colors": "色彩 ({0})",
+	"colorId": "識別碼",
+	"defaultDark": "預設深色",
+	"defaultLight": "預設淺色",
+	"defaultHC": "預設高對比",
+	"JSON Validation": "JSON 驗證 ({0})",
+	"fileMatch": "檔案相符",
+	"schema": "結構描述",
+	"commands": "命令 ({0})",
+	"command name": "名稱",
+	"keyboard shortcuts": "鍵盤快速鍵(&&K)",
+	"menuContexts": "功能表內容",
+	"languages": "語言 ({0})",
+	"language id": "識別碼",
+	"language name": "名稱",
+	"file extensions": "副檔名",
+	"grammar": "文法",
+	"snippets": "程式碼片段"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 0893e280839..4bed8103f5e 100644
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": " 推薦項目",
 	"otherRecommendedExtensions": "其他建議",
 	"workspaceRecommendedExtensions": "工作區建議",
-	"builtInExtensions": "內建",
 	"searchExtensions": "在 Marketplace 中搜尋擴充功能",
 	"sort by installs": "排序依據: 安裝計數",
 	"sort by rating": "排序依據: 評等",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 8c93678ae26..313bfa047bc 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,8 +34,8 @@
 	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
 	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
 	"irreversible": "此動作無法回復!",
-	"cancel": "取消",
-	"permDelete": "永久刪除",
+	"binFailed": "無法使用資源回收筒刪除。您要改為永久刪除嗎？ ",
+	"trashFailed": "無法使用垃圾筒刪除。您要改為永久刪除嗎？",
 	"importFiles": "匯入檔案",
 	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
 	"replaceButtonLabel": "取代(&&R)",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index b86d381ecd0..3f54e82bcea 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -14,6 +14,7 @@
 	"addFolders": "新增資料夾(&A)",
 	"addFolder": "新增資料夾(&A)",
 	"confirmMultiMove": "確定要移動以下 {0} 個文件嗎？",
+	"confirmRootMove": "您確定要變更工作區中根資料夾 '{0}' 的順序嗎？ ",
 	"confirmMove": "確定要移動 '{0}' 嗎?",
 	"doNotAskAgain": "不要再詢問我",
 	"moveButtonLabel": "移動(&&M)",
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..b4173cd7e58
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "HTML 預覽"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..99f3827f916
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "編輯器輸入無效。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..8e9c4235dcd
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "開發人員"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..da7857bbdcf
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "開啟 Webview Developer 工具",
+	"refreshWebviewLabel": "重新載入 Webviews"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 3a808520ab4..c79987737e6 100644
--- a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "是",
+	"no": "否",
+	"doNotAskAgain": "不要再詢問我",
 	"JsonSchema.locale": "要使用的 UI 語言。",
 	"vscode.extension.contributes.localizations": "提供在地化服務給編輯者",
 	"vscode.extension.contributes.localizations.languageId": "顯示已翻譯字串的語言 Id",
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..88fd157d4b8
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "複製",
+	"copyMarkerMessage": "複製訊息"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..8e9b2618050
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "共 {0} 項問題",
+	"filteredProblems": "顯示 {1} 的 {0} 問題"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..6a593deff2f
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "問題",
+	"tooltip.1": "此檔案發生 1 個問題",
+	"tooltip.N": "此檔案發生 {0} 個問題",
+	"markers.showOnFile": "在檔案和資料夾上顯示錯誤和警告。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..84c0330c5cb
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "檢視",
+	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
+	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
+	"problems.panel.configuration.title": "[問題] 檢視",
+	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
+	"markers.panel.title.problems": "問題",
+	"markers.panel.aria.label.problems.tree": "依檔案分組的問題",
+	"markers.panel.no.problems.build": "目前在工作區中未偵測到任何問題。",
+	"markers.panel.no.problems.filters": "使用提供的篩選準則找不到任何結果",
+	"markers.panel.action.filter": "篩選問題",
+	"markers.panel.filter.placeholder": "依類型或文字篩選",
+	"markers.panel.filter.errors": "錯誤",
+	"markers.panel.filter.warnings": "警告",
+	"markers.panel.filter.infos": "資訊",
+	"markers.panel.single.error.label": "1 個錯誤",
+	"markers.panel.multiple.errors.label": "{0} 個錯誤",
+	"markers.panel.single.warning.label": "1 個警告",
+	"markers.panel.multiple.warnings.label": "{0} 個警告",
+	"markers.panel.single.info.label": "1 個資訊",
+	"markers.panel.multiple.infos.label": "{0} 個資訊",
+	"markers.panel.single.unknown.label": "1 個未知",
+	"markers.panel.multiple.unknowns.label": "{0} 個未知",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "發生 {1} 個問題的 {0}",
+	"errors.warnings.show.label": "顯示錯誤和警告"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index fb9f954c81c..8134d240e08 100644
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -7,6 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"keybindingsInputName": "鍵盤快速鍵(&&K)",
+	"showDefaultKeybindings": "顯示預設按鍵繫結",
+	"showUserKeybindings": "顯示使用者按鍵繫結",
 	"SearchKeybindings.AriaLabel": "搜尋按鍵繫結關係",
 	"SearchKeybindings.Placeholder": "搜尋按鍵繫結關係",
 	"sortByPrecedene": "依優先順序排序",
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 5b97663e3cf..41f5ce40bb7 100644
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "顯示下一個搜尋包含模式",
 	"previousSearchIncludePattern": "顯示上一個搜尋包含模式",
-	"nextSearchExcludePattern": "顯示下一個搜尋排除模式",
-	"previousSearchExcludePattern": "顯示上一個搜尋排除模式",
 	"nextSearchTerm": "顯示下一個搜尋字詞",
 	"previousSearchTerm": "顯示上一個搜尋字詞",
 	"showSearchViewlet": "顯示搜尋",
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchView.i18n.json
index 4578dbafa9e..bbc143a1217 100644
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,9 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "切換搜尋詳細資料",
-	"searchScope.includes": "要包含的檔案",
-	"label.includes": "搜尋包含模式",
-	"searchScope.excludes": "要排除的檔案",
-	"label.excludes": "搜尋排除模式",
+	"searchIncludeExclude.label": "要包含/排除的檔案",
+	"searchIncludeExclude.ariaLabel": "搜索包含/排除模式 ",
+	"searchIncludeExclude.placeholder": "例如：src, !*.ts, test/**/*.log",
 	"replaceAll.confirmation.title": "全部取代",
 	"replaceAll.confirm.button": "取代(&&R)",
 	"replaceAll.occurrence.file.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 515b745aabc..02db571b804 100644
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,12 @@
 	"JsonSchema.tasks.group.none": "指派工作到沒有群組",
 	"JsonSchema.tasks.group": "定義工作屬於哪個執行群組。支援將 「組建」新增到組建群組，以及將「測試」新增到測試群組。",
 	"JsonSchema.tasks.type": "定義工作在殼層中會作為處理序或命令來執行。",
+	"JsonSchema.command.quotedString.value": "實際命令值",
+	"JsonSchema.command.quotesString.quote": "如何引用命令值。",
+	"JsonSchema.command": "要執行的命令。可以是外部程式或殼層命令。",
+	"JsonSchema.args.quotedString.value": "實際參數值",
+	"JsonSchema.args.quotesString.quote": "如何引用參數值。",
+	"JsonSchema.tasks.args": "叫用此工作時，傳遞至命令的引數。",
 	"JsonSchema.tasks.label": "工作的使用者介面標籤",
 	"JsonSchema.version": "組態版本號碼",
 	"JsonSchema.tasks.identifier": "用以參考在 launch.json 或 dependsOn 子句中工作的使用者定義識別碼。",
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index f498908a44c..d2f0c4f360a 100644
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,11 @@
 	],
 	"tasksCategory": "工作",
 	"ConfigureTaskRunnerAction.label": "設定工作",
-	"problems": "問題",
+	"totalErrors": "{0} 個錯誤",
+	"totalWarnings": "{0} 個警告",
+	"totalInfos": "{0} 個資訊",
 	"building": "建置中...",
-	"manyMarkers": "99+",
+	"manyProblems": "10K+",
 	"runningTasks": "顯示執行中的工作",
 	"tasks": "工作",
 	"TaskSystem.noHotSwap": "必須重新載入視窗才可變更執行使用中工作的工作執行引擎",
@@ -46,8 +48,8 @@
 	"recentlyUsed": "最近使用的工作",
 	"configured": "設定的工作",
 	"detected": "偵測到的工作",
-	"TaskService.ignoredFolder": "因為下列工作區資料夾使用工作版本 0.1.0，所以已略過: {0}",
 	"TaskService.notAgain": "不要再顯示",
+	"TaskService.ignoredFolder": "因為下列工作區資料夾使用工作版本 0.1.0，所以已略過: {0}",
 	"TaskService.pickRunTask": "請選取要執行的工作",
 	"TaslService.noEntryToRun": "找不到任何要執行的工作。請設定工作...",
 	"TaskService.fetchingBuildTasks": "正在擷取組建工作...",
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 1066b0d3be0..00b03ef2ad6 100644
--- a/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "錯誤: 工作組態 '{0}' 缺少要求的屬性 '{1}'。會略過工作組態。",
 	"ConfigurationParser.notCustom": "錯誤: 未將工作宣告為自訂工作。將會忽略該組態。\n{0}\n",
 	"ConfigurationParser.noTaskName": "錯誤: 一項工作必須提供標籤屬性。即將忽略此工作。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: 工作 '{0}' 是 shell 命令 ，其中一個引數可能有未逸出的空格。若要確保命令列正確引述，請將引數合併到命令中。",
 	"taskConfiguration.noCommandOrDependsOn": "錯誤: 工作 '{0}' 未指定命令與 dependsOn 屬性。將會略過該工作。其定義為: \n{1}",
 	"taskConfiguration.noCommand": "錯誤: 工作 '{0}' 未定義命令。即將略過該工作。其定義為:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "工作版本 2.0.0 不支援全域 OS 特定工作。請使用 OS 特定命令來轉換這些工作。受影響的工作為:\n{0}"
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 1fc27ddf20a..6e6cd238c56 100644
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "複製",
+	"split": "分割",
 	"paste": "貼上",
 	"selectAll": "全選",
-	"clear": "清除",
-	"split": "分割"
+	"clear": "清除"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..bc0754d2c3e
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "版本資訊: {0}",
+	"unassigned": "未指派"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index cda5b7948e8..2e7dd953797 100644
--- a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "稍後",
-	"unassigned": "未指派",
 	"releaseNotes": "版本資訊",
 	"showReleaseNotes": "顯示版本資訊",
 	"read the release notes": "歡迎使用 {0} v{1}! 您要閱讀版本資訊嗎?",
diff --git a/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..7aa96ea3f1e
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "webview 編輯器"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..c7e785dc15e
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "閱讀其他資訊"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..325db145496
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"canNotResolveWorkspaceFolder": "無法解析 $ {workspaceFolder}。請開啟一個資料夾。",
+	"canNotResolveLineNumber": " 無法解析 $ {lineNumber} , 請打開編輯器。",
+	"canNotResolveSelectedText": "無法解析 $ {selectedText} , 請開啟編輯器。",
+	"canNotResolveFile": "無法解析 $ {file} , 請開啟編輯器。",
+	"canNotResolveRelativeFile": "無法解析 $ {relativeFile} , 請開啟編輯器。",
+	"canNotResolveFileDirname": "無法解析 $ {fileDirname} , 請開啟編輯器。",
+	"canNotResolveFileExtname": "無法解析 $ {fileExtname} , 請開啟編輯器。",
+	"canNotResolveFileBasename": "無法解析 $ {fileBasename} , 請開啟編輯器。",
+	"canNotResolveFileBasenameNoExtension": "無法解析 $ {fileBasenameNoExtension} , 請開啟編輯器。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..e3294fd3329
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "是(&&Y)",
+	"cancelButton": "取消"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 822c6c89950..5a1684b4dee 100644
--- a/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,7 @@
 	"neverShowAgain": "不要再顯示",
 	"netVersionError": "需要 Microsoft .NET Framework 4.5。請連入此連結進行安裝。",
 	"learnMore": "說明",
-	"enospcError": "{0} 已超出檔案處理。請按照說明連結解決此問題。",
+	"enospcError": "{0} 無法監看此大型工作區中的檔案變更。請按照連結中的說明來解決此問題。",
 	"binFailed": "無法將 '{0}' 移至資源回收筒",
 	"trashFailed": "無法將 '{0}' 移動至垃圾"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
index 17a563b7b1a..ad99e777e96 100644
--- a/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "檔案資源 ({0}) 無效",
 	"fileIsDirectoryError": "檔案是目錄",
 	"fileNotModifiedError": "未修改檔案的時間",
-	"fileTooLargeForHeapError": "檔案大小超過視窗記憶體限制，請試執行 code --max-memory=NEWSIZE",
 	"fileTooLargeError": "檔案太大無法開啟",
 	"fileNotFoundError": "找不到檔案 ({0})",
 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
diff --git a/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..2ac63294841 100644
--- a/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "取消"
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..05ec8e77798
--- /dev/null
+++ b/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "CSS-Sprachserver",
+	"folding.start": "Regionsanfang wird gefaltet",
+	"folding.end": "Regionsende wird gefaltet"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css-language-features/package.i18n.json b/i18n/deu/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..0d84b581b18
--- /dev/null
+++ b/i18n/deu/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,80 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "CSS Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für CSS-, LESS- und SCSS-Dateien.",
+	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
+	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
+	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
+	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
+	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
+	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
+	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
+	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
+	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
+	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
+	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
+	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
+	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
+	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
+	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
+	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
+	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
+	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
+	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
+	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
+	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
+	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
+	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
+	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
+	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
+	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
+	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
+	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
+	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
+	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
+	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
+	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
+	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
+	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
+	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
+	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"scss.title": "SCSS (SASS)",
+	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
+	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
+	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
+	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
+	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
+	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
+	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
+	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
+	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
+	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
+	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
+	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
+	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
+	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
+	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
+	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
+	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
+	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
+	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
+	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css/package.i18n.json b/i18n/deu/extensions/css/package.i18n.json
index 6c525265ecf..a9ceacd1102 100644
--- a/i18n/deu/extensions/css/package.i18n.json
+++ b/i18n/deu/extensions/css/package.i18n.json
@@ -6,76 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für CSS-, LESS- und SCSS-Dateien.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
-	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
-	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
-	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"scss.title": "SCSS (SASS)",
-	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
-	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
+	"displayName": "CSS-Sprachgrundlagen"
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/commands.i18n.json b/i18n/deu/extensions/git/out/commands.i18n.json
index 390ed62228d..af42eef9ac7 100644
--- a/i18n/deu/extensions/git/out/commands.i18n.json
+++ b/i18n/deu/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "OK",
 	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
 	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
-	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}\" übertragen.",
 	"never again": "OK, nicht mehr anzeigen",
 	"no remotes to publish": "In Ihrem Repository wurden keine Remoteelemente für die Veröffentlichung konfiguriert.",
 	"no changes stash": "Es sind keine Änderungen vorhanden, für die ein Stash ausgeführt werden kann.",
diff --git a/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..6a6d9025074
--- /dev/null
+++ b/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "HTML-Sprachserver",
+	"folding.start": "Regionsanfang wird gefaltet",
+	"folding.end": "Regionsende wird gefaltet"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html-language-features/package.i18n.json b/i18n/deu/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..a18d59eb263
--- /dev/null
+++ b/i18n/deu/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für HTML-, Razor- und Handlebar-Dateien.",
+	"html.format.enable.desc": "Standard-HTML-Formatierer aktivieren/deaktivieren",
+	"html.format.wrapLineLength.desc": "Die maximale Anzahl von Zeichen pro Zeile (0 = deaktiviert).",
+	"html.format.unformatted.desc": "Die Liste der Tags (durch Kommas getrennt), die nicht erneut formatiert werden sollen. \"null\" bezieht sich standardmäßig auf alle Tags, die unter https://www.w3.org/TR/html5/dom.html#phrasing-content aufgeführt werden.",
+	"html.format.contentUnformatted.desc": "Liste der Tags (durch Trennzeichen getrennt), in der der Inhalt nicht neu formatiert werden muss. \"null\" entspricht standardmäßig dem Tag \"pre\".",
+	"html.format.indentInnerHtml.desc": "Nimmt einen Einzug für <head>- und <body>-Abschnitte vor.",
+	"html.format.preserveNewLines.desc": "Gibt an, ob vorhandene Zeilenumbrüche vor Elemente beibehalten werden sollen. Funktioniert nur vor Elementen, nicht in Tags oder für Text.",
+	"html.format.maxPreserveNewLines.desc": "Die maximale Anzahl von Zeilenumbrüchen, die in einem Block beibehalten werden soll. Verwenden Sie \"null\" für eine unbegrenzte Anzahl.",
+	"html.format.indentHandlebars.desc": "Formatiert {{#foo}} und {{/foo}} und nimmt einen Einzug vor.",
+	"html.format.endWithNewline.desc": "Endet mit einer neuen Zeile.",
+	"html.format.extraLiners.desc": "Die Liste der Tags (durch Kommas getrennt), vor denen eine zusätzliche neue Zeile eingefügt werden soll. \"null\" verwendet standardmäßig \"head, body, /HTML\".",
+	"html.format.wrapAttributes.desc": "Attribute umschließen.",
+	"html.format.wrapAttributes.auto": "Attribute nur dann umschließen, wenn die Zeilenlänge überschritten wird.",
+	"html.format.wrapAttributes.force": "Jedes Attribut mit Ausnahme des ersten umschließen.",
+	"html.format.wrapAttributes.forcealign": "Jedes Attribut mit Ausnahme des ersten umschließen und Ausrichtung beibehalten.",
+	"html.format.wrapAttributes.forcemultiline": "Jedes Attribut umschließen.",
+	"html.suggest.angular1.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Angular V1-Tags und -Eigenschaften vorschlägt.",
+	"html.suggest.ionic.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Ionic-Tags, -Eigenschaften und -Werte vorschlägt.",
+	"html.suggest.html5.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung HTML5-Tags, -Eigenschaften und -Werte vorschlägt.",
+	"html.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem HTML-Sprachserver.",
+	"html.validate.scripts": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts unterstützt.",
+	"html.validate.styles": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts validiert.",
+	"html.autoClosingTags": "Automatisches Schließen von HTML-Tags aktivieren/deaktivieren."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html/package.i18n.json b/i18n/deu/extensions/html/package.i18n.json
index a85a95e5d5d..35229bd6699 100644
--- a/i18n/deu/extensions/html/package.i18n.json
+++ b/i18n/deu/extensions/html/package.i18n.json
@@ -5,30 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "HTML-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für HTML-, Razor- und Handlebar-Dateien.",
-	"html.format.enable.desc": "Standard-HTML-Formatierer aktivieren/deaktivieren",
-	"html.format.wrapLineLength.desc": "Die maximale Anzahl von Zeichen pro Zeile (0 = deaktiviert).",
-	"html.format.unformatted.desc": "Die Liste der Tags (durch Kommas getrennt), die nicht erneut formatiert werden sollen. \"null\" bezieht sich standardmäßig auf alle Tags, die unter https://www.w3.org/TR/html5/dom.html#phrasing-content aufgeführt werden.",
-	"html.format.contentUnformatted.desc": "Liste der Tags (durch Trennzeichen getrennt), in der der Inhalt nicht neu formatiert werden muss. \"null\" entspricht standardmäßig dem Tag \"pre\".",
-	"html.format.indentInnerHtml.desc": "Nimmt einen Einzug für <head>- und <body>-Abschnitte vor.",
-	"html.format.preserveNewLines.desc": "Gibt an, ob vorhandene Zeilenumbrüche vor Elemente beibehalten werden sollen. Funktioniert nur vor Elementen, nicht in Tags oder für Text.",
-	"html.format.maxPreserveNewLines.desc": "Die maximale Anzahl von Zeilenumbrüchen, die in einem Block beibehalten werden soll. Verwenden Sie \"null\" für eine unbegrenzte Anzahl.",
-	"html.format.indentHandlebars.desc": "Formatiert {{#foo}} und {{/foo}} und nimmt einen Einzug vor.",
-	"html.format.endWithNewline.desc": "Endet mit einer neuen Zeile.",
-	"html.format.extraLiners.desc": "Die Liste der Tags (durch Kommas getrennt), vor denen eine zusätzliche neue Zeile eingefügt werden soll. \"null\" verwendet standardmäßig \"head, body, /HTML\".",
-	"html.format.wrapAttributes.desc": "Attribute umschließen.",
-	"html.format.wrapAttributes.auto": "Attribute nur dann umschließen, wenn die Zeilenlänge überschritten wird.",
-	"html.format.wrapAttributes.force": "Jedes Attribut mit Ausnahme des ersten umschließen.",
-	"html.format.wrapAttributes.forcealign": "Jedes Attribut mit Ausnahme des ersten umschließen und Ausrichtung beibehalten.",
-	"html.format.wrapAttributes.forcemultiline": "Jedes Attribut umschließen.",
-	"html.suggest.angular1.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Angular V1-Tags und -Eigenschaften vorschlägt.",
-	"html.suggest.ionic.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Ionic-Tags, -Eigenschaften und -Werte vorschlägt.",
-	"html.suggest.html5.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung HTML5-Tags, -Eigenschaften und -Werte vorschlägt.",
-	"html.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem HTML-Sprachserver.",
-	"html.validate.scripts": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts unterstützt.",
-	"html.validate.styles": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts validiert.",
-	"html.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert syntaxabhängige Faltungsmarkierungen.",
-	"html.autoClosingTags": "Automatisches Schließen von HTML-Tags aktivieren/deaktivieren."
+	]
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..fa24cd1104c
--- /dev/null
+++ b/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "JSON-Sprachserver"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json-language-features/package.i18n.json b/i18n/deu/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..422563eeb75
--- /dev/null
+++ b/i18n/deu/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "JSON-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für JSON-Dateien.",
+	"json.schemas.desc": "Schemas zu JSON-Dateien im aktuellen Projekt zuordnen",
+	"json.schemas.url.desc": "Eine URL zu einem Schema oder ein relativer Pfad zu einem Schema im aktuellen Verzeichnis",
+	"json.schemas.fileMatch.desc": "Ein Array von Dateimustern, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
+	"json.schemas.fileMatch.item.desc": "Ein Dateimuster, das \"*\" enthalten kann, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
+	"json.schemas.schema.desc": "Die Schemadefinition für die angegebene URL. Das Schema muss nur angegeben werden, um Zugriffe auf die Schema-URL zu vermeiden.",
+	"json.format.enable.desc": "Standard-JSON-Formatierer aktivieren/deaktivieren (Neustart erforderlich)",
+	"json.tracing.desc": "Verfolgt die Kommunikation zwischen VS Code und JSON-Sprachserver nach.",
+	"json.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"json.colorDecorators.enable.deprecationMessage": "Die Einstellung \"json.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json/package.i18n.json b/i18n/deu/extensions/json/package.i18n.json
index 1ee4f4553c8..35229bd6699 100644
--- a/i18n/deu/extensions/json/package.i18n.json
+++ b/i18n/deu/extensions/json/package.i18n.json
@@ -5,17 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "JSON-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für JSON-Dateien.",
-	"json.schemas.desc": "Schemas zu JSON-Dateien im aktuellen Projekt zuordnen",
-	"json.schemas.url.desc": "Eine URL zu einem Schema oder ein relativer Pfad zu einem Schema im aktuellen Verzeichnis",
-	"json.schemas.fileMatch.desc": "Ein Array von Dateimustern, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-	"json.schemas.fileMatch.item.desc": "Ein Dateimuster, das \"*\" enthalten kann, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-	"json.schemas.schema.desc": "Die Schemadefinition für die angegebene URL. Das Schema muss nur angegeben werden, um Zugriffe auf die Schema-URL zu vermeiden.",
-	"json.format.enable.desc": "Standard-JSON-Formatierer aktivieren/deaktivieren (Neustart erforderlich)",
-	"json.tracing.desc": "Verfolgt die Kommunikation zwischen VS Code und JSON-Sprachserver nach.",
-	"json.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"json.colorDecorators.enable.deprecationMessage": "Die Einstellung \"json.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"json.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen."
+	]
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..fdc135e8bec
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles' konnte nicht geladen werden: {0}"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..98c4ffb61e2
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/features/preview.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."
+	],
+	"previewTitle": "Vorschau von {0}"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..1793456fe9d
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "In diesem Dokument wurden einige Inhalte deaktiviert.",
+	"preview.securityMessage.title": "Potenziell unsichere Inhalte wurden in der Markdown-Vorschau deaktiviert. Ändern Sie die Sicherheitseinstellung der Markdown-Vorschau, um unsichere Inhalte zuzulassen oder Skripts zu aktivieren.",
+	"preview.securityMessage.label": "Sicherheitswarnung – Inhalt deaktiviert"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/security.i18n.json b/i18n/deu/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..828b182b8ed
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Nur sicheren Inhalt laden",
+	"insecureContent.title": "Unsicheren Inhalt zulassen",
+	"insecureContent.description": "Laden von Inhalten über HTTP aktivieren",
+	"disable.title": "Deaktivieren",
+	"disable.description": "Alle Inhalte und Skriptausführung zulassen. Nicht empfohlen.",
+	"moreInfo.title": "Weitere Informationen",
+	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
+	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
+	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
+	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/package.i18n.json b/i18n/deu/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..8cae9ecc07d
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,31 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Markdown-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für Markdown.",
+	"markdown.preview.breaks.desc": "Legt fest, wie Zeilenumbrüche in der Markdown-Vorschau gerendert werden. Die Einstellung 'true' erzeugt ein <br> für jede neue Zeile.",
+	"markdown.preview.linkify": "Aktiviert oder deaktiviert die Konvertierung von URL-ähnlichem Text in Links in der Markdown-Vorschau.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Doppelklicken Sie in die Markdown-Vorschau, um zum Editor zu wechseln.",
+	"markdown.preview.fontFamily.desc": "Steuert die Schriftfamilie, die in der Markdownvorschau verwendet wird.",
+	"markdown.preview.fontSize.desc": "Steuert den Schriftgrad in Pixeln, der in der Markdownvorschau verwendet wird.",
+	"markdown.preview.lineHeight.desc": "Steuert die Zeilenhöhe, die in der Markdownvorschau verwendet wird. Diese Zahl ist relativ zum Schriftgrad.",
+	"markdown.preview.markEditorSelection.desc": "Markieren Sie die aktuelle Editor-Auswahl in der Markdown-Vorschau.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Wenn für die Markdown-Vorschau ein Bildlauf durchgeführt wird, aktualisieren Sie die Ansicht der Vorschau.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Veraltet] Führt einen Bildlauf für die Markdown-Vorschau durch, um die aktuell ausgewählte Zeile im Editor anzuzeigen.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Diese Einstellung wurde durch \"markdown.preview.scrollPreviewWithEditor\" ersetzt und ist nicht mehr wirksam.",
+	"markdown.preview.title": "Vorschau öffnen",
+	"markdown.previewFrontMatter.dec": "Legt fest, wie die YAML-Titelei in der Markdownvorschau gerendert werden soll. Durch \"hide\" wird die Titelei entfernt. Andernfalls wird die Titelei wie Markdowninhalt verarbeitet.",
+	"markdown.previewSide.title": "Vorschau an der Seite öffnen",
+	"markdown.showLockedPreviewToSide.title": "Gesperrte Vorschau an der Seite öffnen",
+	"markdown.showSource.title": "Quelle anzeigen",
+	"markdown.styles.dec": "Eine Liste von URLs oder lokalen Pfaden zu CSS-Stylesheets aus der Markdownvorschau, die verwendet werden sollen. Relative Pfade werden relativ zu dem Ordner interpretiert, der im Explorer geöffnet ist. Wenn kein Ordner geöffnet ist, werden sie relativ zum Speicherort der Markdowndatei interpretiert. Alle '\\' müssen als '\\\\' geschrieben werden.",
+	"markdown.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für Vorschau ändern",
+	"markdown.trace.desc": "Aktiviert die Debugprotokollierung für die Markdown-Erweiterung.",
+	"markdown.preview.refresh.title": "Vorschau aktualisieren",
+	"markdown.preview.toggleLock.title": "Vorschausperre umschalten"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..5805f86da6e
--- /dev/null
+++ b/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "Möchten Sie zulassen, dass {0} (als Arbeitsbereichseinstellung definiert) zum Bereinigen von PHP-Dateien ausgeführt wird?",
+	"php.yes": "Zulassen",
+	"php.no": "Nicht zulassen",
+	"wrongExecutable": "Eine Überprüfung ist nicht möglich, da {0} keine gültige ausführbare PHP-Datei ist. Verwenden Sie die Einstellung \"'php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
+	"noExecutable": "Eine Überprüfung ist nicht möglich, da keine ausführbare PHP-Datei festgelegt ist. Verwenden Sie die Einstellung \"php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
+	"unknownReason": "Fehler beim Ausführen von PHP mithilfe des Pfads \"{0}\". Die Ursache ist unbekannt."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php-language-features/package.i18n.json b/i18n/deu/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..3b7f987e66a
--- /dev/null
+++ b/i18n/deu/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,17 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Konfiguriert, ob die integrierten PHP-Sprachvorschläge aktiviert sind. Die Unterstützung schlägt globale und variable PHP-Elemente vor.",
+	"configuration.validate.enable": "Integrierte PHP-Überprüfung aktivieren/deaktivieren.",
+	"configuration.validate.executablePath": "Zeigt auf die ausführbare PHP-Datei.",
+	"configuration.validate.run": "Gibt an, ob der Linter beim Speichern oder bei der Eingabe ausgeführt wird.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Ausführbare Datei für PHP-Überprüfung nicht zulassen (als Arbeitsbereicheinstellung definiert)",
+	"displayName": "PHP-Sprachfeatures"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php/package.i18n.json b/i18n/deu/extensions/php/package.i18n.json
index b969aa85c93..ef10b47a8b3 100644
--- a/i18n/deu/extensions/php/package.i18n.json
+++ b/i18n/deu/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Konfiguriert, ob die integrierten PHP-Sprachvorschläge aktiviert sind. Die Unterstützung schlägt globale und variable PHP-Elemente vor.",
-	"configuration.validate.enable": "Integrierte PHP-Überprüfung aktivieren/deaktivieren.",
-	"configuration.validate.executablePath": "Zeigt auf die ausführbare PHP-Datei.",
-	"configuration.validate.run": "Gibt an, ob der Linter beim Speichern oder bei der Eingabe ausgeführt wird.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Ausführbare Datei für PHP-Überprüfung nicht zulassen (als Arbeitsbereicheinstellung definiert)",
-	"displayName": "PHP-Sprachfeatures",
-	"description": "Bietet IntelliSense, Bereinigen und Sprachgrundlagen für PHP-Dateien."
+	"displayName": "PHP-Sprachfeatures"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 631d23eff3f..4ae1e88e8f2 100644
--- a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "Es wurden keine Ergebnisse gefunden.",
 	"settingsSearchIssue": "Fehler in Einstellungssuche ",
 	"bugReporter": "Fehlerbericht",
-	"performanceIssue": "Leistungsproblem",
 	"featureRequest": "Featureanforderung",
+	"performanceIssue": "Leistungsproblem",
 	"stepsToReproduce": "Zu reproduzierende Schritte",
 	"bugDescription": "Geben Sie an, welche Schritte ausgeführt werden müssen, um das Problem zuverlässig zu reproduzieren. Was sollte geschehen, und was ist stattdessen geschehen? Wir unterstützen GitHub Flavored Markdown. Sie können während der Vorschau in GitHub Ihr Problem bearbeiten und Screenshots hinzufügen.",
 	"performanceIssueDesciption": "Wann ist dieses Leistungsproblem aufgetreten? Tritt es beispielsweise beim Start oder nach einer bestimmten Reihe von Aktionen auf? Wir unterstützen GitHub Flavored Markdown. Sie können während der Vorschau in GitHub Ihr Problem bearbeiten und Screenshots hinzufügen.",
diff --git a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
index eee74c27615..cbc53f2c2a6 100644
--- a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,6 @@
 	"warningBorder": "Rahmenfarbe von Warnungsunterstreichungen im Editor.",
 	"infoForeground": "Vordergrundfarbe von Informationsunterstreichungen im Editor.",
 	"infoBorder": "Rahmenfarbe von Informationsunterstreichungen im Editor.",
-	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen.",
 	"overviewRuleError": "Übersichtslineal-Markierungsfarbe für Fehler.",
 	"overviewRuleWarning": "Übersichtslineal-Markierungsfarbe für Warnungen.",
 	"overviewRuleInfo": "Übersichtslineal-Markierungsfarbe für Informationen."
diff --git a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index d1e83453813..9822e6e535d 100644
--- a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Gehe zu nächstem Problem (Fehler, Warnung, Information)",
-	"markerAction.previous.label": "Gehe zu vorigem Problem (Fehler, Warnung, Information)",
-	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
-	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
+	"markerAction.previous.label": "Gehe zu vorigem Problem (Fehler, Warnung, Information)"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..a710ee11dcf
--- /dev/null
+++ b/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
+	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
+	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
+	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 9d57cce8b1d..f72633a93df 100644
--- a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,6 @@
 	"wordHighlightStrong": "Hintergrundfarbe eines Symbols bei Schreibzugriff, beispielsweise dem Schreiben einer Variable. Die Farbe muss durchsichtig sein, um nicht dahinterliegende Dekorationen zu verbergen.",
 	"wordHighlightBorder": "Randfarbe eines Symbols beim Lesezugriff, wie etwa beim Lesen einer Variablen.",
 	"wordHighlightStrongBorder": "Randfarbe eines Symbols beim Schreibzugriff, wie etwa beim Schreiben einer Variablen.",
-	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.",
-	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.",
 	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
 	"wordHighlight.previous.label": "Gehe zur vorherigen Symbolhervorhebungen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..86e0a5c4225
--- /dev/null
+++ b/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 weitere Datei wird nicht angezeigt",
+	"moreFiles": "...{0} weitere Dateien werden nicht angezeigt"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..73350e0c953
--- /dev/null
+++ b/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "Abbrechen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 786adadf99d..8eaf7a54f37 100644
--- a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,13 @@
 	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
 	"MarketPlaceDisabled": "Marketplace ist nicht aktiviert.",
 	"removeError": "Fehler beim Entfernen der Erweiterung: {0}. Bitte beenden Sie und starten Sie VS Code neu bevor Sie erneut versuchen die Erweiterung zu installieren.",
-	"Not Market place extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
+	"Not a Marketplace extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
 	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
 	"malicious extension": "Die Erweiterung kann nicht installiert werden, da sie als problematisch gemeldet wurde.",
 	"notFoundCompatibleDependency": "Kann nicht installiert werden, da die abhängige Erweiterung '{0}', die mit der aktuellen VS Code Version '{1}' kompatibel ist, nicht gefunden werden kann. ",
 	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
 	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
 	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
-	"uninstallOnly": "Nur",
-	"uninstallAll": "Alle",
 	"uninstallConfirmation": "Möchten Sie \"{0}\" deinstallieren?",
 	"ok": "OK",
 	"singleDependentError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterung \"{1}\" hängt von dieser Erweiterung ab.",
diff --git a/i18n/deu/src/vs/platform/list/browser/listService.i18n.json b/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
index 204a5c783e7..d3f2996964a 100644
--- a/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Der Modifizierer zum Hinzufügen eines Elements in Bäumen und Listen zu einer Mehrfachauswahl mit der Maus (zum Beispiel im Explorer, in geöffneten Editoren und in der SCM-Ansicht). \"ctrlCmd\" wird unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet. Die Mausbewegung \"Seitlich öffnen\" wird – sofern unterstützt – so angepasst, dass kein Konflikt mit dem Modifizierer zur Mehrfachauswahl entsteht.",
 	"openMode.singleClick": "Öffnet Elemente mit einem einzelnen Mausklick.",
 	"openMode.doubleClick": "Öffnet Elemente mit einem doppelten Mausklick.",
-	"openModeModifier": "Steuert, wie Elemente in Bäumen und Listen mithilfe der Maus geöffnet werden (sofern unterstützt). Legen Sie \"singleClick\" fest, um Elemente mit einem einzelnen Mausklick zu öffnen, und \"doubleClick\", damit sie nur mit einem doppelten Mausklick geöffnet werden. Bei übergeordneten Elementen, deren untergeordnete Elemente sich in Bäumen befinden, steuert diese Einstellung, ob ein Einfachklick oder ein Doppelklick das übergeordnete Elemente erweitert. Beachten Sie, dass einige Bäume und Listen diese Einstellung ggf. ignorieren, wenn sie nicht zutrifft."
+	"openModeModifier": "Steuert, wie Elemente in Bäumen und Listen mithilfe der Maus geöffnet werden (sofern unterstützt). Legen Sie \"singleClick\" fest, um Elemente mit einem einzelnen Mausklick zu öffnen, und \"doubleClick\", damit sie nur mit einem doppelten Mausklick geöffnet werden. Bei übergeordneten Elementen, deren untergeordnete Elemente sich in Bäumen befinden, steuert diese Einstellung, ob ein Einfachklick oder ein Doppelklick das übergeordnete Elemente erweitert. Beachten Sie, dass einige Bäume und Listen diese Einstellung ggf. ignorieren, wenn sie nicht zutrifft.",
+	"horizontalScrolling setting": "Steuert, ob Bäume horizontales Scrollen in der Workbench unterstützen."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/markers/common/markers.i18n.json b/i18n/deu/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..e5b40fe4a67
--- /dev/null
+++ b/i18n/deu/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Fehler",
+	"sev.warning": "Warnung",
+	"sev.info": "Info"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
index dd41efec383..2e98d7310d1 100644
--- a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -92,7 +92,5 @@
 	"mergeBorder": "Rahmenfarbe für Kopfzeilen und die Aufteilung in Inline-Mergingkonflikten.",
 	"overviewRulerCurrentContentForeground": "Aktueller Übersichtslineal-Vordergrund für Inline-Mergingkonflikte.",
 	"overviewRulerIncomingContentForeground": "Eingehender Übersichtslineal-Vordergrund für Inline-Mergingkonflikte. ",
-	"overviewRulerCommonContentForeground": "Hintergrund des Übersichtslineals des gemeinsamen übergeordneten Elements bei Inlinezusammenführungskonflikten.",
-	"overviewRulerFindMatchForeground": "Übersichtslineal-Markierungsfarbe für Suchübereinstimmungen.",
-	"overviewRulerSelectionHighlightForeground": "Übersichtslineal-Markierungsfarbe für Auswahlhervorhebungen."
+	"overviewRulerCommonContentForeground": "Hintergrund des Übersichtslineals des gemeinsamen übergeordneten Elements bei Inlinezusammenführungskonflikten."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 1fe62d2efcb..bfd72770d07 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Fokus in nächster Gruppe",
 	"openToSide": "Zur Seite öffnen",
 	"closeEditor": "Editor schließen",
+	"closeOneEditor": "Schließen",
 	"revertAndCloseActiveEditor": "Wiederherstellen und Editor schließen",
 	"closeEditorsToTheLeft": "Editoren links schließen",
 	"closeAllEditors": "Alle Editoren schließen",
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index c7fbfd6ffe1..6054596bd29 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Schließen",
 	"araLabelEditorActions": "Editor-Aktionen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
index d7684461feb..21a380f1297 100644
--- a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,8 +45,6 @@
 	"windowConfigurationTitle": "Fenster",
 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
 	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
-	"window.openFilesInNewWindow.default": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden (nur MacOS).",
-	"openFilesInNewWindow": "Steuert, ob Dateien in einem neuen Fenster oder im letzten aktiven Fenster geöffnet werden.\n- default: Die Dateien werden im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden (nur macOS).\n- on: Die Dateien werden in einem neuen Fenster geöffnet.\n- off: Die Dateien werden im letzten aktiven Fenster geöffnet.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
 	"window.openFoldersInNewWindow.on": "Ordner werden in einem neuen Fenster geöffnet.",
 	"window.openFoldersInNewWindow.off": "Ordner ersetzen das letzte aktive Fenster.",
 	"window.openFoldersInNewWindow.default": "Ordner werden in einem neuen Fenster geöffnet, sofern kein Ordner innerhalb der Anwendung ausgewählt wird (z. B. über das Dateimenü).",
@@ -58,7 +56,6 @@
 	"restoreWindows": "Steuert, wie Fenster nach einem Neustart erneut geöffnet werden. Wählen Sie \"none\", um immer mit einem leeren Arbeitsbereich zu beginnen, \"one\", um das zuletzt verwendete Fenster erneut zu öffnen, \"folders\", um alle Fenster, in denen Ordner geöffnet waren, erneut zu öffnen, oder \"all\", um alle Fenster der letzten Sitzung erneut zu öffnen.",
 	"restoreFullscreen": "Steuert, ob ein Fenster im Vollbildmodus wiederhergestellt wird, wenn es im Vollbildmodus beendet wurde.",
 	"zoomLevel": "Passen Sie den Zoomfaktor des Fensters an. Die ursprüngliche Größe ist 0. Jede Inkrementierung nach oben (z. B. 1) oder unten (z. B. -1) stellt eine Vergrößerung bzw. Verkleinerung um 20 % dar. Sie können auch Dezimalwerte eingeben, um den Zoomfaktor genauer anzupassen.",
-	"title": "Steuert den Fenstertitel basierend auf dem aktiven Editor. Variablen werden abhängig vom Kontext ersetzt:\n${activeEditorShort}: der Dateiname (z. B. myFile.txt)\n${activeEditorMedium}: der Pfad der Datei, relativ zum Arbeitsbereichsordner (z. B. myFolder/myFile.txt)\n${activeEditorLong}: der vollständige Pfad der Datei (z. B. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: Name des Arbeitsbereichsordners, der die Datei enthält (z. B. myFolder) \n${folderPath}: Dateipfad des Arbeitsbereichsordners, der die Datei enthält (z. B. /Users/Development/myFolder)\n${rootName}: Name des Arbeitsbereichs (z. B. myFolder oder myWorkspace)\n${rootPath}: Dateipfad des Arbeitsbereichs (z. B. /Users/Development/myWorkspace)\n${appName}: z. B. VS Code\n${dirty}: ein Änderungsindikator, wenn der aktive Editor geändert wurde\n${separator}: ein bedingtes Trennzeichen (\" - \"), das nur angezeigt wird, wenn es zwischen Variablen mit Werten steht",
 	"window.newWindowDimensions.default": "Öffnet neue Fenster in der Mitte des Bildschirms.",
 	"window.newWindowDimensions.inherit": "Öffnet neue Fenster mit den gleichen Abmessungen wie das letzte aktive Fenster.",
 	"window.newWindowDimensions.maximized": "Öffnet neue Fenster maximiert.",
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index e7fc581ef98..659f9528874 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Frame neu starten",
 	"removeBreakpoint": "Haltepunkt entfernen",
 	"removeAllBreakpoints": "Alle Haltepunkte entfernen",
-	"enableBreakpoint": "Haltepunkt aktivieren",
-	"disableBreakpoint": "Haltepunkt deaktivieren",
 	"enableAllBreakpoints": "Alle Haltepunkte aktivieren",
 	"disableAllBreakpoints": "Alle Haltepunkte deaktivieren",
 	"activateBreakpoints": "Haltepunkte aktivieren",
 	"deactivateBreakpoints": "Haltepunkte deaktivieren",
 	"reapplyAllBreakpoints": "Alle Haltepunkte erneut anwenden",
 	"addFunctionBreakpoint": "Funktionshaltepunkt hinzufügen",
-	"addConditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
-	"editConditionalBreakpoint": "Haltepunkt bearbeiten...",
 	"setValue": "Wert festlegen",
 	"addWatchExpression": "Ausdruck hinzufügen",
 	"editWatchExpression": "Ausdruck bearbeiten",
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..93b4d514d00
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
+	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
+	"breakpointWidgetHitCountAriaLabel": "Das Programm wird nur angehalten, wenn die Bedingung für die Trefferanzahl erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
+	"breakpointWidgetAriaLabel": "Das Programm wird nur angehalten, wenn diese Bedingung erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
+	"expression": "Ausdruck",
+	"hitCount": "Trefferanzahl"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 9da3944bf5c..ddf54889d34 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Haltepunkt bearbeiten...",
+	"disableBreakpoint": "Haltepunkt deaktivieren",
+	"enableBreakpoint": "Haltepunkt aktivieren",
 	"removeBreakpoints": "Haltepunkte entfernen",
 	"removeBreakpointOnColumn": "Haltepunkt in Spalte {0} entfernen",
 	"removeLineBreakpoint": "Zeilenhaltepunkt entfernen",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "Haltepunkt in Spalte {0} aktivieren",
 	"enableBreakpointOnLine": "Zeilenhaltepunkt aktivieren",
 	"addBreakpoint": "Haltepunkt hinzufügen",
+	"conditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
 	"addConfiguration": "Konfiguration hinzufügen..."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 451f6c89a46..e0c41c377e0 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -28,7 +28,5 @@
 	"preLaunchTaskExitCode": "Der preLaunchTask \"{0}\" wurde mit dem Exitcode {1} beendet.",
 	"showErrors": "Fehler anzeigen",
 	"noFolderWorkspaceDebugError": "Debuggen der aktiven Datei ist nicht möglich. Stellen Sie sicher, dass sie auf einem Datenträger gespeichert ist und dass Sie die Debugerweiterung für diesen Dateityp installiert haben.",
-	"cancel": "Abbrechen",
-	"DebugTaskNotFound": "Der preLaunchTask \"{0}\" wurde nicht gefunden.",
-	"taskNotTracked": "Der preLaunchTask \"{0}\" kann nicht getrackt werden."
+	"cancel": "Abbrechen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 5b2cebadb75..7b308ecd6d4 100644
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,8 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereichsordner)",
 	"malicious tooltip": "Die Erweiterung wurde als problematisch gemeldet.",
 	"malicious": "Böswillig",
+	"disabled": "Deaktiviert",
+	"disabled globally": "Deaktiviert",
 	"disableAll": "Alle installierten Erweiterungen löschen",
 	"disableAllWorkspace": "Alle installierten Erweiterungen für diesen Arbeitsbereich deaktivieren",
 	"enableAll": "Alle Erweiterungen aktivieren",
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..179eb06b234
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,56 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Erweiterungsname",
+	"extension id": "Erweiterungsbezeichner",
+	"builtin": "Integriert",
+	"publisher": "Name des Herausgebers",
+	"install count": "Installationsanzahl",
+	"rating": "Bewertung",
+	"license": "Lizenz",
+	"details": "Details",
+	"contributions": "Beiträge",
+	"changelog": "ChangeLog",
+	"dependencies": "Abhängigkeiten",
+	"noReadme": "Keine INFODATEI verfügbar.",
+	"noChangelog": "Es ist kein ChangeLog verfügbar.",
+	"noContributions": "Keine Beiträge",
+	"noDependencies": "Keine Abhängigkeiten",
+	"settings": "Einstellungen ({0})",
+	"setting name": "Name",
+	"description": "Beschreibung",
+	"default": "Standard",
+	"debuggers": "Debugger ({0})",
+	"debugger name": "Name",
+	"debugger type": "Typ",
+	"views": "Ansichten ({0})",
+	"view id": "ID",
+	"view name": "Name",
+	"view location": "Wo",
+	"localizations": "Lokalisierungen ({0})",
+	"localizations language id": "Sprach-ID",
+	"localizations language name": "Sprachname",
+	"localizations localized language name": "Sprachname (lokalisiert)",
+	"colorThemes": "Farbdesigns ({0})",
+	"iconThemes": "Symboldesigns ({0})",
+	"colors": "Farben ({0})",
+	"defaultDark": "Standard, dunkel",
+	"defaultLight": "Standard, hell",
+	"defaultHC": "Standard, hoher Kontrast",
+	"JSON Validation": "JSON-Validierung ({0})",
+	"commands": "Befehle ({0})",
+	"command name": "Name",
+	"keyboard shortcuts": "Tastenkombinationen",
+	"menuContexts": "Menükontexte",
+	"languages": "Sprachen ({0})",
+	"language id": "ID",
+	"language name": "Name",
+	"file extensions": "Dateierweiterungen",
+	"grammar": "Grammatik",
+	"snippets": "Codeausschnitte"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 29577e29ba6..a3725fa64c5 100644
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "Empfohlen",
 	"otherRecommendedExtensions": "Weitere Empfehlungen",
 	"workspaceRecommendedExtensions": "Arbeitsbereich-Empfehlungen",
-	"builtInExtensions": "Integriert",
 	"searchExtensions": "Nach Erweiterungen im Marketplace suchen",
 	"sort by installs": "Sortieren nach: Installationsanzahl",
 	"sort by rating": "Sortieren nach: Bewertung",
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 157f84b48e7..4ba0d0b4fea 100644
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,11 @@
 	"confirmMoveTrashMessageMultiple": "Möchten Sie die folgenden {0} Dateien löschen?",
 	"confirmMoveTrashMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich löschen?",
 	"confirmMoveTrashMessageFile": "Möchten Sie \"{0}\" wirklich löschen?",
-	"undoBin": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-	"undoTrash": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
 	"doNotAskAgain": "Nicht erneut fragen",
 	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
 	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
 	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
 	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"cancel": "Abbrechen",
-	"permDelete": "Endgültig löschen",
 	"importFiles": "Dateien importieren",
 	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
 	"replaceButtonLabel": "&&Ersetzen",
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..755aaf46f80
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "HTML-Vorschau"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..4a857815246
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "Ungültige Editor-Eingabe."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..0c1f5497f13
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Entwickler"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..1492a37abd0
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Webview-Entwicklertools öffnen",
+	"refreshWebviewLabel": "Webviews erneut laden"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 2e89465d3be..b1ad2f843d9 100644
--- a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "Ja",
+	"no": "Nein",
+	"doNotAskAgain": "Nicht erneut fragen",
 	"JsonSchema.locale": "Die zu verwendende Sprache der Benutzeroberfläche.",
 	"vscode.extension.contributes.localizations": "Trägt Lokalisierungen zum Editor bei",
 	"vscode.extension.contributes.localizations.languageId": "ID der Sprache, in die Anzeigezeichenfolgen übersetzt werden.",
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..778741d8c94
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Kopieren"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..3926e145e99
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Insgesamt {0} Probleme",
+	"filteredProblems": "Zeigt {0} von {1} Problemen an"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..58d6f84f140
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.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."
+	],
+	"label": "Probleme",
+	"markers.showOnFile": "Fehler & Warnungen auf Dateien und Ordnern anzeigen."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..6b3a52e72b9
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Anzeigen",
+	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
+	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
+	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
+	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
+	"markers.panel.title.problems": "Probleme",
+	"markers.panel.aria.label.problems.tree": "Probleme nach Dateien gruppiert",
+	"markers.panel.no.problems.build": "Es wurden bisher keine Probleme im Arbeitsbereich erkannt.",
+	"markers.panel.no.problems.filters": "Es wurden keine Ergebnisse mit den angegebenen Filterkriterien gefunden.",
+	"markers.panel.action.filter": "Probleme filtern",
+	"markers.panel.filter.placeholder": "Nach Typ oder Text filtern",
+	"markers.panel.filter.errors": "Fehler",
+	"markers.panel.filter.warnings": "Warnungen",
+	"markers.panel.filter.infos": "Informationen",
+	"markers.panel.single.error.label": "1 Fehler",
+	"markers.panel.multiple.errors.label": "{0} Fehler",
+	"markers.panel.single.warning.label": "1 Warnung",
+	"markers.panel.multiple.warnings.label": "{0} Warnungen",
+	"markers.panel.single.info.label": "1 Information",
+	"markers.panel.multiple.infos.label": "{0}-Informationen",
+	"markers.panel.single.unknown.label": "1 Unbekannte",
+	"markers.panel.multiple.unknowns.label": "{0} Unbekannte",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} mit {1} Problemen",
+	"errors.warnings.show.label": "Fehler und Warnungen anzeigen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index f953fa7ad28..f36a3d9c95f 100644
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Nächstes Sucheinschlussmuster anzeigen",
 	"previousSearchIncludePattern": "Vorheriges Sucheinschlussmuster anzeigen",
-	"nextSearchExcludePattern": "Nächstes Suchausschlussmuster anzeigen",
-	"previousSearchExcludePattern": "Vorheriges Suchausschlussmuster anzeigen",
 	"nextSearchTerm": "Nächsten Suchbegriff anzeigen",
 	"previousSearchTerm": "Vorherigen Suchbegriff anzeigen",
 	"showSearchViewlet": "Suche anzeigen",
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
index f2f216a0a04..97d605ad472 100644
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Suchdetails umschalten",
-	"searchScope.includes": "Einzuschließende Dateien",
-	"label.includes": "Sucheinschlussmuster",
-	"searchScope.excludes": "Auszuschließende Dateien",
-	"label.excludes": "Suchausschlussmuster",
 	"replaceAll.confirmation.title": "Alle ersetzen",
 	"replaceAll.confirm.button": "&&Ersetzen",
 	"replaceAll.occurrence.file.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzt.",
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 31dfb0b2d5e..37a1bba4e0c 100644
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "Weist die Aufgabe keiner Gruppe zu.",
 	"JsonSchema.tasks.group": "Definiert die Ausführungsgruppe, zu der diese Aufgabe gehört. Zum Hinzufügen der Aufgabe zur Buildgruppe wird \"build\" unterstützt und zum Hinzufügen zur Testgruppe \"test\".",
 	"JsonSchema.tasks.type": "Definiert, ob die Aufgabe als Prozess oder als Befehl innerhalb einer Shell ausgeführt wird.",
+	"JsonSchema.command": "Der auszuführende Befehl. Es kann sich um ein externes Programm oder einen Shellbefehl handeln.",
+	"JsonSchema.tasks.args": "Argumente, die an den Befehl übergeben werden, wenn diese Aufgabe aufgerufen wird.",
 	"JsonSchema.tasks.label": "Die Bezeichnung der Aufgabe der Benutzerschnittstelle",
 	"JsonSchema.version": "Die Versionsnummer der Konfiguration.",
 	"JsonSchema.tasks.identifier": "Ein vom Benutzer definierter Bezeichner, mit dem in \"launch.json\" oder in einer dependsOn-Klausel auf die Aufgabe verwiesen wird.",
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index f3b5da63084..b20a17cd7a7 100644
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,10 @@
 	],
 	"tasksCategory": "Aufgaben",
 	"ConfigureTaskRunnerAction.label": "Aufgabe konfigurieren",
-	"problems": "Probleme",
+	"totalErrors": "{0} Fehler",
+	"totalWarnings": "{0} Warnungen",
+	"totalInfos": "{0}-Informationen",
 	"building": "Wird gebaut...",
-	"manyMarkers": "mehr als 99",
 	"runningTasks": "Aktive Aufgaben anzeigen",
 	"tasks": "Aufgaben",
 	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
@@ -46,8 +47,8 @@
 	"recentlyUsed": "zuletzt verwendete Aufgaben",
 	"configured": "konfigurierte Aufgaben",
 	"detected": "erkannte Aufgaben",
-	"TaskService.ignoredFolder": "Die folgenden Arbeitsbereichsordner werden ignoriert, da sie Aufgabenversion 0.1.0 verwenden: {0}",
 	"TaskService.notAgain": "Nicht mehr anzeigen",
+	"TaskService.ignoredFolder": "Die folgenden Arbeitsbereichsordner werden ignoriert, da sie Aufgabenversion 0.1.0 verwenden: {0}",
 	"TaskService.pickRunTask": "Auszuführende Aufgabe auswählen",
 	"TaslService.noEntryToRun": "Es wurde keine auszuführende Aufgabe gefunden. Aufgaben konfigurieren...",
 	"TaskService.fetchingBuildTasks": "Buildaufgaben werden abgerufen...",
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 5f774b9427a..2dfda5e5aca 100644
--- a/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Fehler: Die Aufgabenkonfiguration \"{0}\" enthält die erforderlich Eigenschaft \"{1}\" nicht. Die Aufgabenkonfiguration wird ignoriert.",
 	"ConfigurationParser.notCustom": "Fehler: Die Aufgabe ist nicht als benutzerdefinierte Aufgabe deklariert. Die Konfiguration wird ignoriert.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Fehler: Eine Aufgabe muss eine label-Eigenschaft angeben. Die Aufgabe wird ignoriert.\n{0}\n",
-	"taskConfiguration.shellArgs": "Warnung: Die Aufgabe \"{0}\" ist ein Shellbefehl, und eines seiner Argumente enthält Leerzeichen ohne Escapezeichen. Führen Sie Argumente im Befehl zusammen, um eine korrekte Angabe der Befehlszeile sicherzustellen.",
 	"taskConfiguration.noCommandOrDependsOn": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl bzw. keine depondsOn-Eigenschaft. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
 	"taskConfiguration.noCommand": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Die Aufgabenversion 2.0.0 unterstützt globale betriebssystemspezifische Aufgaben nicht. Konvertieren Sie sie in eine Aufgabe mit einem betriebssystemspezifischen Befehl. Folgende Aufgaben sind hiervon betroffen:\n{0}"
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 10ca73d9616..6fee7de3b43 100644
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Kopieren",
+	"split": "Teilen",
 	"paste": "Einfügen",
 	"selectAll": "Alles auswählen",
-	"clear": "Löschen",
-	"split": "Teilen"
+	"clear": "Löschen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..e9c3a683375
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Anmerkungen zu dieser Version: {0}",
+	"unassigned": "Nicht zugewiesen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index f2d901b3bb9..e77ab265d42 100644
--- a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "Später",
-	"unassigned": "Nicht zugewiesen",
 	"releaseNotes": "Anmerkungen zu dieser Version",
 	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
 	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
diff --git a/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..0a2dcb8a2c9
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "Webview-Editor"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..eab41295e8a
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "Weitere Informationen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..4a29a1c902d
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Ja",
+	"cancelButton": "Abbrechen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 37247fac832..d1ad985a6bd 100644
--- a/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,6 @@
 	"neverShowAgain": "Nicht mehr anzeigen",
 	"netVersionError": "Microsoft .NET Framework 4.5 ist erforderlich. Klicken Sie auf den Link, um die Anwendung zu installieren.",
 	"learnMore": "Anweisungen",
-	"enospcError": "Keine Dateihandles mehr in {0} vorhanden. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
 	"binFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb.",
 	"trashFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
index 548b1344de6..a2229be0cee 100644
--- a/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
 	"fileNotModifiedError": "Datei nicht geändert seit",
-	"fileTooLargeForHeapError": "Die Dateigröße überschreitet die maximale Speichergröße für Fenster. Führen Sie folgenden Code aus: --max-memory=NEWSIZE",
 	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
 	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
diff --git a/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..56b19fa3a5a 100644
--- a/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Abbrechen"
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..0100d5fd5a7
--- /dev/null
+++ b/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "Servidor de lenguaje CSS",
+	"folding.start": "Inicio de la región plegable",
+	"folding.end": "Fin de la región plegable"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css-language-features/package.i18n.json b/i18n/esn/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..5b2576647c5
--- /dev/null
+++ b/i18n/esn/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,79 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Características del lenguaje CSS",
+	"description": "Proporciona un potente soporte de lenguaje para archivos CSS, LESS y SCSS.",
+	"css.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
+	"css.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
+	"css.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
+	"css.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
+	"css.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
+	"css.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
+	"css.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
+	"css.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
+	"css.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
+	"css.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
+	"css.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
+	"css.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
+	"css.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
+	"css.lint.unknownProperties.desc": "Propiedad desconocida.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
+	"css.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
+	"css.lint.zeroUnits.desc": "No se necesita una unidad para cero",
+	"css.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje CSS.",
+	"css.validate.title": "Controla la validación de CSS y la gravedad de los problemas.",
+	"css.validate.desc": "Habilita o deshabilita todas las validaciones",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
+	"less.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
+	"less.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
+	"less.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
+	"less.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
+	"less.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
+	"less.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
+	"less.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
+	"less.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
+	"less.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
+	"less.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
+	"less.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
+	"less.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
+	"less.lint.unknownProperties.desc": "Propiedad desconocida.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
+	"less.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
+	"less.lint.zeroUnits.desc": "No se necesita una unidad para cero",
+	"less.validate.title": "Controla la validación de LESS y la gravedad de los problemas.",
+	"less.validate.desc": "Habilita o deshabilita todas las validaciones",
+	"scss.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
+	"scss.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
+	"scss.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
+	"scss.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
+	"scss.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
+	"scss.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
+	"scss.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
+	"scss.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
+	"scss.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
+	"scss.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
+	"scss.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
+	"scss.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
+	"scss.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
+	"scss.lint.unknownProperties.desc": "Propiedad desconocida.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
+	"scss.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
+	"scss.lint.zeroUnits.desc": "No se necesita una unidad para cero",
+	"scss.validate.title": "Controla la validación de SCSS y la gravedad de los problemas.",
+	"scss.validate.desc": "Habilita o deshabilita todas las validaciones",
+	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"css.colorDecorators.enable.deprecationMessage": "El valor \"css.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
+	"scss.colorDecorators.enable.deprecationMessage": "El valor \"scss.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
+	"less.colorDecorators.enable.deprecationMessage": "El valor \"less.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css/package.i18n.json b/i18n/esn/extensions/css/package.i18n.json
index 91d31339c05..a0ca458b69d 100644
--- a/i18n/esn/extensions/css/package.i18n.json
+++ b/i18n/esn/extensions/css/package.i18n.json
@@ -6,76 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Características del lenguaje CSS",
-	"description": "Proporciona un potente soporte de lenguaje para archivos CSS, LESS y SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"css.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"css.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"css.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"css.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"css.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"css.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"css.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"css.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"css.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"css.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"css.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"css.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"css.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"css.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"css.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"css.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje CSS.",
-	"css.validate.title": "Controla la validación de CSS y la gravedad de los problemas.",
-	"css.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"less.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"less.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"less.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"less.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"less.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"less.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"less.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"less.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"less.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"less.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"less.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"less.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"less.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"less.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"less.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"less.validate.title": "Controla la validación de LESS y la gravedad de los problemas.",
-	"less.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"scss.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"scss.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"scss.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"scss.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"scss.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"scss.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"scss.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"scss.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"scss.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"scss.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"scss.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"scss.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"scss.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"scss.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"scss.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"scss.validate.title": "Controla la validación de SCSS y la gravedad de los problemas.",
-	"scss.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"css.colorDecorators.enable.deprecationMessage": "El valor \"css.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"scss.colorDecorators.enable.deprecationMessage": "El valor \"scss.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"less.colorDecorators.enable.deprecationMessage": "El valor \"less.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
+	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos CSS, LESS y SCSS."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/commands.i18n.json b/i18n/esn/extensions/git/out/commands.i18n.json
index dad69ea9b3f..53ebb086ddb 100644
--- a/i18n/esn/extensions/git/out/commands.i18n.json
+++ b/i18n/esn/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "Aceptar",
 	"push with tags success": "Insertado con etiquetas correctamente.",
 	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
-	"sync is unpredictable": "Esta acción insertará y extraerá confirmaciones en '{0}'.",
 	"never again": "No volver a mostrar ",
 	"no remotes to publish": "El repositorio no tiene remotos configurados en los que publicar.",
 	"no changes stash": "No existen cambios para el guardado provisional.",
diff --git a/i18n/esn/extensions/git/package.i18n.json b/i18n/esn/extensions/git/package.i18n.json
index 0fdd9b9bbbf..87a73cba8a7 100644
--- a/i18n/esn/extensions/git/package.i18n.json
+++ b/i18n/esn/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Controla si se debe mostrar una acción de archivo abierto en la vista de cambios en Git",
 	"config.inputValidation": "Controla cuándo mostrar el mensaje de validación de entrada en el contador de entrada.",
 	"config.detectSubmodules": "Controla si se detectan automáticamente los submódulos Git. ",
+	"config.detectSubmodulesLimit": "Controla el límite de submódulos de git detectados.",
 	"colors.modified": "Color para recursos modificados.",
 	"colors.deleted": "Color para los recursos eliminados.",
 	"colors.untracked": "Color para los recursos a los que no se les hace seguimiento.",
diff --git a/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..9900526f77a
--- /dev/null
+++ b/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "Servidor de lenguaje HTML",
+	"folding.start": "Inicio de la región plegable",
+	"folding.end": "Fin de la región plegable"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html-language-features/package.i18n.json b/i18n/esn/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..44cb8a85815
--- /dev/null
+++ b/i18n/esn/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Características del lenguaje HTML",
+	"description": "Proporciona un potente soporte del lenguaje para archivos HTML, Razor y Handlebar.",
+	"html.format.enable.desc": "Habilitar o deshabilitar el formateador HTML predeterminado",
+	"html.format.wrapLineLength.desc": "Cantidad máxima de caracteres por línea (0 = deshabilitar).",
+	"html.format.unformatted.desc": "Lista de etiquetas, separadas por comas, a las que no se debe volver a aplicar formato. El valor predeterminado de \"null\" son todas las etiquetas mostradas en https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Lista de etiquetas, separadas por comas, en las que el contenido no debe volver a formatearse. \"null\" se establece de manera predeterminada en la etiqueta \"pre\".",
+	"html.format.indentInnerHtml.desc": "Aplicar sangría a las secciones <head> y <body>.",
+	"html.format.preserveNewLines.desc": "Indica si los saltos de línea existentes delante de los elementos deben conservarse. Solo funciona delante de los elementos, no dentro de las etiquetas o con texto.",
+	"html.format.maxPreserveNewLines.desc": "Número máximo de saltos de línea que deben conservarse en un fragmento. Use \"null\" para que el número sea ilimitado.",
+	"html.format.indentHandlebars.desc": "Formato y sangría {{#foo}} y {{/foo}}.",
+	"html.format.endWithNewline.desc": "Finalizar con una nueva línea.",
+	"html.format.extraLiners.desc": "Lista de etiquetas, separadas por comas, que deben tener una nueva línea adicional delante. \"null\" tiene como valores predeterminados \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Ajustar atributos.",
+	"html.format.wrapAttributes.auto": "Ajustar atributos solo cuando se supera la longitud de la línea.",
+	"html.format.wrapAttributes.force": "Ajustar todos los atributos excepto el primero.",
+	"html.format.wrapAttributes.forcealign": "Ajustar todos los atributos excepto el primero y mantener la alineación.",
+	"html.format.wrapAttributes.forcemultiline": "Ajustar todos los atributos.",
+	"html.suggest.angular1.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas y propiedades de Angular V1.",
+	"html.suggest.ionic.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de Ionic.",
+	"html.suggest.html5.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de HTML5.",
+	"html.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje HTML.",
+	"html.validate.scripts": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los scripts insertados.",
+	"html.validate.styles": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los estilos insertados.",
+	"html.autoClosingTags": "Habilita o deshabilita el cierre automático de las etiquetas HTML."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html/package.i18n.json b/i18n/esn/extensions/html/package.i18n.json
index fbe039bb6bf..114d2d72125 100644
--- a/i18n/esn/extensions/html/package.i18n.json
+++ b/i18n/esn/extensions/html/package.i18n.json
@@ -6,29 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Características del lenguaje HTML",
-	"description": "Proporciona un potente soporte del lenguaje para archivos HTML, Razor y Handlebar.",
-	"html.format.enable.desc": "Habilitar o deshabilitar el formateador HTML predeterminado",
-	"html.format.wrapLineLength.desc": "Cantidad máxima de caracteres por línea (0 = deshabilitar).",
-	"html.format.unformatted.desc": "Lista de etiquetas, separadas por comas, a las que no se debe volver a aplicar formato. El valor predeterminado de \"null\" son todas las etiquetas mostradas en https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Lista de etiquetas, separadas por comas, en las que el contenido no debe volver a formatearse. \"null\" se establece de manera predeterminada en la etiqueta \"pre\".",
-	"html.format.indentInnerHtml.desc": "Aplicar sangría a las secciones <head> y <body>.",
-	"html.format.preserveNewLines.desc": "Indica si los saltos de línea existentes delante de los elementos deben conservarse. Solo funciona delante de los elementos, no dentro de las etiquetas o con texto.",
-	"html.format.maxPreserveNewLines.desc": "Número máximo de saltos de línea que deben conservarse en un fragmento. Use \"null\" para que el número sea ilimitado.",
-	"html.format.indentHandlebars.desc": "Formato y sangría {{#foo}} y {{/foo}}.",
-	"html.format.endWithNewline.desc": "Finalizar con una nueva línea.",
-	"html.format.extraLiners.desc": "Lista de etiquetas, separadas por comas, que deben tener una nueva línea adicional delante. \"null\" tiene como valores predeterminados \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Ajustar atributos.",
-	"html.format.wrapAttributes.auto": "Ajustar atributos solo cuando se supera la longitud de la línea.",
-	"html.format.wrapAttributes.force": "Ajustar todos los atributos excepto el primero.",
-	"html.format.wrapAttributes.forcealign": "Ajustar todos los atributos excepto el primero y mantener la alineación.",
-	"html.format.wrapAttributes.forcemultiline": "Ajustar todos los atributos.",
-	"html.suggest.angular1.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas y propiedades de Angular V1.",
-	"html.suggest.ionic.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de Ionic.",
-	"html.suggest.html5.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de HTML5.",
-	"html.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje HTML.",
-	"html.validate.scripts": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los scripts insertados.",
-	"html.validate.styles": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los estilos insertados.",
-	"html.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis.",
-	"html.autoClosingTags": "Habilita o deshabilita el cierre automático de las etiquetas HTML."
+	"displayName": "Conceptos básicos de lenguaje HTML"
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..253bfb394d3
--- /dev/null
+++ b/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "Servidor de lenguaje JSON"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json-language-features/package.i18n.json b/i18n/esn/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..d18d8b81bc3
--- /dev/null
+++ b/i18n/esn/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Características del lenguaje JSON",
+	"description": "Proporciona un potente soporte de lenguaje para archivos JSON.",
+	"json.schemas.desc": "Asociar esquemas a archivos JSON en el proyecto actual",
+	"json.schemas.url.desc": "Una dirección URL a un esquema o una ruta de acceso relativa a un esquema en el directorio actual",
+	"json.schemas.fileMatch.desc": "Una matriz de patrones de archivo con los cuales coincidir cuando los archivos JSON se resuelvan en esquemas.",
+	"json.schemas.fileMatch.item.desc": "Un patrón de archivo que puede contener \"*\" con el cual coincidir cuando los archivos JSON se resuelvan en esquemas.",
+	"json.schemas.schema.desc": "La definición de esquema de la dirección URL determinada. Solo se necesita proporcionar el esquema para evitar los accesos a la dirección URL del esquema.",
+	"json.format.enable.desc": "Habilitar/deshabilitar formateador JSON predeterminado (requiere reiniciar)",
+	"json.tracing.desc": "Realiza el seguimiento de la comunicación entre VS Code y el servidor de lenguaje JSON.",
+	"json.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"json.colorDecorators.enable.deprecationMessage": "El valor \"json.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json/package.i18n.json b/i18n/esn/extensions/json/package.i18n.json
index a3e0c5de0ee..4586ba0848a 100644
--- a/i18n/esn/extensions/json/package.i18n.json
+++ b/i18n/esn/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Características del lenguaje JSON",
-	"description": "Proporciona un potente soporte de lenguaje para archivos JSON.",
-	"json.schemas.desc": "Asociar esquemas a archivos JSON en el proyecto actual",
-	"json.schemas.url.desc": "Una dirección URL a un esquema o una ruta de acceso relativa a un esquema en el directorio actual",
-	"json.schemas.fileMatch.desc": "Una matriz de patrones de archivo con los cuales coincidir cuando los archivos JSON se resuelvan en esquemas.",
-	"json.schemas.fileMatch.item.desc": "Un patrón de archivo que puede contener \"*\" con el cual coincidir cuando los archivos JSON se resuelvan en esquemas.",
-	"json.schemas.schema.desc": "La definición de esquema de la dirección URL determinada. Solo se necesita proporcionar el esquema para evitar los accesos a la dirección URL del esquema.",
-	"json.format.enable.desc": "Habilitar/deshabilitar formateador JSON predeterminado (requiere reiniciar)",
-	"json.tracing.desc": "Seguimiento de comunicación entre VS Code y el servidor de lenguaje JSON",
-	"json.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"json.colorDecorators.enable.deprecationMessage": "El valor \"json.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"json.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis."
+	"displayName": "Conceptos básicos de lenguaje JSON",
+	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos JSON."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..a97aa29723b
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "No se pudo cargar 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..0743f600836
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[Vista previa] {0}",
+	"previewTitle": "Vista Previa {0}"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..ef0bed92441
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "Se ha deshabilitado parte del contenido de este documento",
+	"preview.securityMessage.title": "Se ha deshabilitado el contenido potencialmente inseguro en la previsualización de Markdown. Para permitir el contenido inseguro o habilitar scripts cambie la configuración de la previsualización de Markdown",
+	"preview.securityMessage.label": "Alerta de seguridad de contenido deshabilitado"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/security.i18n.json b/i18n/esn/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..09a54bc2ce3
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Cargar solo el contenido seguro",
+	"insecureContent.title": "Permitir contenido no seguro",
+	"insecureContent.description": "Habilitar el contenido de carga sobre http",
+	"disable.title": "Deshabilitar",
+	"disable.description": "Permitir todo el contenido y la ejecución de scripts. No se recomienda.",
+	"moreInfo.title": "Más información",
+	"enableSecurityWarning.title": "Habilitar advertencias de seguridad de vista previa en este espacio de trabajo",
+	"disableSecurityWarning.title": "Deshabilitar advertencias de seguridad de vista previa en este espacio de trabajo",
+	"preview.showPreviewSecuritySelector.title": "Seleccione configuración de seguridad para las previsualizaciones de Markdown en esta área de trabajo"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/package.i18n.json b/i18n/esn/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..0e6d8a1f74f
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Características del lenguaje Markdown",
+	"description": "Proporciona un potente soporte de lenguaje para archivos Markdown.",
+	"markdown.preview.breaks.desc": "Establece cómo los saltos de línea son representados en la vista previa de markdown. Estableciendolo en 'true' crea un <br> para cada nueva línea.",
+	"markdown.preview.linkify": "Habilitar o deshabilitar la conversión de texto de tipo URL a enlaces en la vista previa de markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Haga doble clic en la vista previa de Markdown para cambiar al editor.",
+	"markdown.preview.fontFamily.desc": "Controla la familia de la fuente utilizada en la previsualización del descuento.",
+	"markdown.preview.fontSize.desc": "Controla el tamaño de la fuente en píxeles utilizado en la previsualización del descuento.",
+	"markdown.preview.lineHeight.desc": "Controla la altura de línea utilizada en la previsualización del descuento. Este número es relativo al tamaño de la fuente.",
+	"markdown.preview.markEditorSelection.desc": "Marca la selección del editor actual en la vista previa de Markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Al desplazarse en la vista previa de Markdown, se actualiza la vista del editor.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Al desplazarse en el editor de Markdown, se actualiza la vista de la previsualización .",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Desestimado] Desplaza la vista previa de Markdown para revelar la línea del editor seleccionada actualmente.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Este valor se ha reemplazado por \"markdown.preview.scrollPreviewWithEditor\" y ya no tiene ningún efecto.",
+	"markdown.preview.title": "Abrir vista previa",
+	"markdown.previewFrontMatter.dec": "Establece cómo se debe representar el asunto de la parte delantera de YAML en la vista previa del descuento. 'hide' quita el asunto de la parte delantera. De lo contrario, el asunto de la parte delantera se trata como contenido del descuento.",
+	"markdown.previewSide.title": "Abrir vista previa en el lateral",
+	"markdown.showLockedPreviewToSide.title": "Abrir vista previa fija en el lateral",
+	"markdown.showSource.title": "Mostrar origen",
+	"markdown.styles.dec": "Una lista de direcciones URL o rutas de acceso locales a hojas de estilo CSS que utilizar desde la vista previa del descuento. Las tutas de acceso relativas se interpretan en relación con la carpeta abierta en el explorador. Si no hay ninguna carpeta abierta, se interpretan en relación con la ubicación del archivo del descuento. Todos los '\\' deben escribirse como '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Cambiar configuración de seguridad de vista previa",
+	"markdown.trace.desc": "Habilitar registro de depuración para las extensiones de Markdown. ",
+	"markdown.preview.refresh.title": "Actualizar vista previa",
+	"markdown.preview.toggleLock.title": "Cambiar fijación de la vista previa "
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..a2041159412
--- /dev/null
+++ b/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "¿Permite la ejecución de {0} (definido como valor del área de trabajo) para detectar errores en archivos PHP?",
+	"php.yes": "Permitir",
+	"php.no": "No permitir",
+	"wrongExecutable": "No se puede validar porque {0} no es un ejecutable PHP válido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable PHP.",
+	"noExecutable": "No se puede validar porque no hay ningún ejecutable PHP establecido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable de PHP.",
+	"unknownReason": "No se pudo ejecutar el archivo PHP con la ruta de acceso: {0}. Se desconoce el motivo."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php-language-features/package.i18n.json b/i18n/esn/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..dd2f1e37fd8
--- /dev/null
+++ b/i18n/esn/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Configura si se habilitan las sugerencias del lenguaje PHP integradas. La asistencia sugiere variables y opciones globales de PHP.",
+	"configuration.validate.enable": "Habilita o deshabilita la validación integrada de PHP.",
+	"configuration.validate.executablePath": "Señala al ejecutable PHP.",
+	"configuration.validate.run": "Indica si linter se ejecuta al guardar o al escribir.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "No permitir el ejecutable de validación de PHP (como configuración de área de trabajo)"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php/package.i18n.json b/i18n/esn/extensions/php/package.i18n.json
index 1e2e57cee70..e7b6423f2b6 100644
--- a/i18n/esn/extensions/php/package.i18n.json
+++ b/i18n/esn/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Configura si se habilitan las sugerencias del lenguaje PHP integradas. La asistencia sugiere variables y opciones globales de PHP.",
-	"configuration.validate.enable": "Habilita o deshabilita la validación integrada de PHP.",
-	"configuration.validate.executablePath": "Señala al ejecutable PHP.",
-	"configuration.validate.run": "Indica si linter se ejecuta al guardar o al escribir.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "No permitir el ejecutable de validación de PHP (como configuración de área de trabajo)",
-	"displayName": "Características del lenguaje PHP",
-	"description": "Proporciona IntelliSense, linting y conceptos básicos del lenguaje para archivos de PHP."
+	"displayName": "Características del lenguaje PHP"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 9719ad40a2d..bdde741219f 100644
--- a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "No se encontraron resultados",
 	"settingsSearchIssue": "Problema de búsqueda de configuración",
 	"bugReporter": "Informe de errores",
-	"performanceIssue": "Problema de rendimiento",
 	"featureRequest": "Solicitud de característica",
+	"performanceIssue": "Problema de rendimiento",
 	"stepsToReproduce": "Pasos para reproducir",
 	"bugDescription": "Indique los pasos necesarios para reproducir el problema. Debe incluir el resultado real y el resultado esperado. Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
 	"performanceIssueDesciption": "¿Cuándo ocurrió este problema de rendimiento? ¿Se produce al inicio o después de realizar una serie específica de acciones? Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
diff --git a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 9b8e29dd1a9..131e96b837a 100644
--- a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,12 +6,12 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"lineHighlight": "Color de fondo del resaltado de línea en la posición del cursor.",
+	"lineHighlight": "Color de fondo para la línea resaltada en la posición del cursor.",
 	"lineHighlightBorderBox": "Color de fondo del borde alrededor de la línea en la posición del cursor.",
 	"rangeHighlight": "Color de fondo de los rangos resaltados, como por ejemplo las características de abrir rápidamente y encontrar. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
 	"rangeHighlightBorder": "Color de fondo del borde alrededor de los intervalos resaltados.",
 	"caret": "Color del cursor del editor.",
-	"editorCursorBackground": "Color de fondo del cursor de edición. Permite personalizar el color del carácter solapado por el bloque del cursor.",
+	"editorCursorBackground": "Color de fondo del cursor de edición. Permite personalizar el color del caracter solapado por el bloque del cursor.",
 	"editorWhitespaces": "Color de los caracteres de espacio en blanco del editor.",
 	"editorIndentGuides": "Color de las guías de sangría del editor.",
 	"editorLineNumbers": "Color de números de línea del editor.",
@@ -28,7 +28,6 @@
 	"warningBorder": "Color de borde de squigglies de advertencia en el editor.",
 	"infoForeground": "Color de primer plano de los subrayados ondulados informativos en el editor.",
 	"infoBorder": "Color del borde de los subrayados ondulados informativos en el editor.",
-	"overviewRulerRangeHighlight": "Color de marcador de regla de información general para intervalos resaltados.",
 	"overviewRuleError": "Color de marcador de regla de información general para errores. ",
 	"overviewRuleWarning": "Color de marcador de regla de información general para advertencias.",
 	"overviewRuleInfo": "Color de marcador de regla de información general para mensajes informativos. "
diff --git a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 5682e32cf74..ce6be2a8dc0 100644
--- a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Ir al siguiente problema (Error, Advertencia, Información)",
-	"markerAction.previous.label": "Ir al problema anterior (Error, Advertencia, Información)",
-	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
-	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
+	"markerAction.previous.label": "Ir al problema anterior (Error, Advertencia, Información)"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..862620a88d9
--- /dev/null
+++ b/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
+	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
+	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
+	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..f494743a105
--- /dev/null
+++ b/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"November": "Noviembre",
+	"JulyShort": "Jul",
+	"DecemberShort": "Dic"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 430b8e97079..d7c592b45d8 100644
--- a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,6 @@
 	"wordHighlightStrong": "Color de fondo de un símbolo durante el acceso de escritura, como escribir en una variable. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
 	"wordHighlightBorder": "Color de fondo de un símbolo durante el acceso de lectura; por ejemplo, cuando se lee una variable.",
 	"wordHighlightStrongBorder": "Color de fondo de un símbolo durante el acceso de escritura; por ejemplo, cuando se escribe una variable.",
-	"overviewRulerWordHighlightForeground": "Color de marcador de regla de información general para símbolos resaltados.",
-	"overviewRulerWordHighlightStrongForeground": "Color de marcador de regla de información general para símbolos de acceso de escritura resaltados. ",
 	"wordHighlight.next.label": "Ir al siguiente símbolo destacado",
 	"wordHighlight.previous.label": "Ir al símbolo destacado anterior"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..cf1d1d7ad84
--- /dev/null
+++ b/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 archivo más que no se muestra",
+	"moreFiles": "...{0} archivos más que no se muestran"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..4a277edc564
--- /dev/null
+++ b/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 0206bd0f46c..87bd0fe318c 100644
--- a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,12 @@
 	"errorInstallingDependencies": "Error instalando dependencias. {0}",
 	"MarketPlaceDisabled": "Marketplace no está habilitado",
 	"removeError": "Error al quitar la extensión: {0}. Salga e inicie VS Code antes de intentarlo de nuevo.",
-	"Not Market place extension": "Solo se pueden reinstalar las extensiones de Marketplace",
 	"notFoundCompatible": "No se pueden instalar '{0}'; no hay ninguna versión disponible compatible con VS Code '{1}'. ",
 	"malicious extension": "No se puede instalar la extensión ya que se informó que era problemático.",
 	"notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.",
 	"quitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
 	"exitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
 	"uninstallDependeciesConfirmation": "¿Quiere desinstalar solo '{0}' o también sus dependencias?",
-	"uninstallOnly": "Solo",
-	"uninstallAll": "Todo",
 	"uninstallConfirmation": "¿Seguro que quiere desinstalar '{0}'?",
 	"ok": "Aceptar",
 	"singleDependentError": "No se puede desinstalar la extensión '{0}'. La extensión '{1}' depende de esta.",
diff --git a/i18n/esn/src/vs/platform/markers/common/markers.i18n.json b/i18n/esn/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..2229fecdaf4
--- /dev/null
+++ b/i18n/esn/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Error",
+	"sev.warning": "Advertencia",
+	"sev.info": "Información"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
index 2ff0a4aa513..075049e313b 100644
--- a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -92,7 +92,5 @@
 	"mergeBorder": "Color del borde en los encabezados y el divisor en conflictos de combinación alineados.",
 	"overviewRulerCurrentContentForeground": "Primer plano de la regla de visión general actual para conflictos de combinación alineados.",
 	"overviewRulerIncomingContentForeground": "Primer plano de regla de visión general de entrada para conflictos de combinación alineados.",
-	"overviewRulerCommonContentForeground": "Primer plano de la regla de visión general de ancestros comunes para conflictos de combinación alineados.",
-	"overviewRulerFindMatchForeground": "Color de marcador de regla de información general para coincidencias encontradas.",
-	"overviewRulerSelectionHighlightForeground": "Color de marcador de regla de información general para elementos seleccionados resaltados."
+	"overviewRulerCommonContentForeground": "Primer plano de la regla de visión general de ancestros comunes para conflictos de combinación alineados."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index c174fe9d262..78e8984a534 100644
--- a/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"requirearray": "views debe ser una mariz",
+	"requirearray": "Las vistas deben ser una matriz",
 	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
 	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
 	"vscode.extension.contributes.view.id": "Identificador de la vista. Úselo para registrar un proveedor de datos mediante la API \"vscode.window.registerTreeDataProviderForView\". También para desencadenar la activación de su extensión al registrar el evento \"onView:${id}\" en \"activationEvents\".",
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 2597aecdf39..e35e95658e0 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Enfocar el grupo siguiente",
 	"openToSide": "Abrir en el lateral",
 	"closeEditor": "Cerrar editor",
+	"closeOneEditor": "Cerrar",
 	"revertAndCloseActiveEditor": "Revertir y cerrar el editor",
 	"closeEditorsToTheLeft": "Cerrar los editores a la izquierda",
 	"closeAllEditors": "Cerrar todos los editores",
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 9367c8315b0..9310ecec997 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Cerrar",
 	"araLabelEditorActions": "Acciones del editor"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 4147b8a00c3..62d7de2c6f0 100644
--- a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,8 +45,6 @@
 	"windowConfigurationTitle": "Ventana",
 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
 	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
-	"window.openFilesInNewWindow.default": "Los archivos se abrirán en la ventana con la carpeta de los archivos abierta o en la última ventana activa a menos que se abran mediante el Dock o el Finder (solo macOS)",
-	"openFilesInNewWindow": "Controla si los archivos deben abrirse en una ventana nueva.\n- default: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran mediante el Dock o desde el Finder (solo macOS)\n- on: los archivos se abrirán en una ventana nueva\n- off: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa\nTenga en cuenta que aún puede haber casos en los que este parámetro se ignore (por ejemplo, al usar la opción de la línea de comandos -new-window o -reuse-window).",
 	"window.openFoldersInNewWindow.on": "Las carpetas se abrirán en una nueva ventana",
 	"window.openFoldersInNewWindow.off": "Las carpetas reemplazarán la ventana activa más reciente",
 	"window.openFoldersInNewWindow.default": "Las carpetas se abrirán en una nueva ventana a menos que se seleccione una carpeta desde la aplicación (p. ej. mediante el menú Archivo)",
@@ -58,7 +56,6 @@
 	"restoreWindows": "Controla cómo se vuelven a abrir las ventanas tras un reinicio. Seleccione \"none\" para comenzar siempre con un área de trabajo vacía, \"one\" para volver a abrir la última ventana en la que trabajó, \"folders\" para volver a abrir todas las ventanas que tenían carpetas abiertas o \"all\" para volver a abrir todas las ventanas de la última sesión.",
 	"restoreFullscreen": "Controla si una ventana se debe restaurar al modo de pantalla completa si se salió de ella en dicho modo.",
 	"zoomLevel": "Ajuste el nivel de zoom de la ventana. El tamaño original es 0 y cada incremento (por ejemplo, 1) o disminución (por ejemplo, -1) representa una aplicación de zoom un 20 % más grande o más pequeño. También puede especificar decimales para ajustar el nivel de zoom con una granularidad más precisa.",
-	"title": "Controla el título de ventana basado en el editor activo. Las variables se sustituyen según el contexto: ${activeEditorShort}: el archivo nombre (e.g. miarchivo.txt) ${activeEditorMedium}: la ruta del archivo en relación con el área de trabajo carpeta (por ejemplo, myFolder/myFile.txt) ${activeEditorLong}: la ruta de acceso completa del archivo (p. ej. / Users/Development/myProject/myFolder/myFile.txt) ${nombre de carpeta}: nombre de la carpeta el archivo del espacio de trabajo está contenida en (e.g. myFolder) ${folderPath}: ruta del archivo de la carpeta el archivo del espacio de trabajo está contenida en (por ejemplo, /Users/Development/myFolder) {} $ rootName}: nombre de la área de trabajo (por ejemplo myFolder o myWorkspace) ${Ruta_raíz}: ruta del archivo del espacio de trabajo (por ejemplo, /Users/Development/myWorkspace) ${appName}: por ejemplo VS código ${sucio}: un indicador sucio si el editor activo es sucio ${separador}: condicional separador (\"-\") que sólo muestra cuando rodeada de variables con valores",
 	"window.newWindowDimensions.default": "Abrir las nuevas ventanas en el centro de la pantalla.",
 	"window.newWindowDimensions.inherit": "Abrir las nuevas ventanas con la misma dimensión que la última activa.",
 	"window.newWindowDimensions.maximized": "Abrir las nuevas ventanas maximizadas.",
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index dd1b28c53bf..eee54fa1f1c 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Reiniciar marco",
 	"removeBreakpoint": "Quitar punto de interrupción",
 	"removeAllBreakpoints": "Quitar todos los puntos de interrupción",
-	"enableBreakpoint": "Habilitar punto de interrupción",
-	"disableBreakpoint": "Deshabilitar punto de interrupción",
 	"enableAllBreakpoints": "Habilitar todos los puntos de interrupción",
 	"disableAllBreakpoints": "Deshabilitar todos los puntos de interrupción",
 	"activateBreakpoints": "Activar puntos de interrupción",
 	"deactivateBreakpoints": "Desactivar puntos de interrupción",
 	"reapplyAllBreakpoints": "Volver a aplicar todos los puntos de interrupción",
 	"addFunctionBreakpoint": "Agregar punto de interrupción de función",
-	"addConditionalBreakpoint": "Agregar punto de interrupción condicional...",
-	"editConditionalBreakpoint": "Editar punto de interrupción...",
 	"setValue": "Establecer valor",
 	"addWatchExpression": "Agregar expresión",
 	"editWatchExpression": "Editar expresión",
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..72b3d080b9d
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
+	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
+	"breakpointWidgetHitCountAriaLabel": "El programa solo se detendrá aquí si se alcanza el número de llamadas. Presione ENTRAR para aceptar o Esc para cancelar.",
+	"breakpointWidgetAriaLabel": "El programa solo se detendrá aquí si esta condición es true. Presione ENTRAR para aceptar o Esc para cancelar.",
+	"expression": "Expresión",
+	"hitCount": "Número de llamadas"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index b33d36b0b85..1c8d3ad1e17 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Editar punto de interrupción...",
+	"disableBreakpoint": "Deshabilitar punto de interrupción",
+	"enableBreakpoint": "Habilitar punto de interrupción",
 	"removeBreakpoints": "Quitar puntos de interrupción",
 	"removeBreakpointOnColumn": "Quitar punto de interrupción en la columna {0}",
 	"removeLineBreakpoint": "Quitar punto de interrupción de línea",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "Habilitar punto de interrupción en la columna {0}",
 	"enableBreakpointOnLine": "Habilitar punto de interrupción de línea",
 	"addBreakpoint": "Agregar punto de interrupción",
+	"conditionalBreakpoint": "Agregar punto de interrupción condicional...",
 	"addConfiguration": "Agregar configuración..."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 818cc21eb9a..98205ab953f 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,5 @@
 	"showErrors": "Mostrar errores",
 	"noFolderWorkspaceDebugError": "El archivo activo no se puede depurar. Compruebe que se ha guardado en el disco y que tiene una extensión de depuración instalada para ese tipo de archivo.",
 	"cancel": "Cancelar",
-	"DebugTaskNotFound": "No se encontró el elemento preLaunchTask '{0}'.",
-	"taskNotTracked": "No se puede realizar un seguimiento de la tarea preLaunchTask '{0}'."
+	"DebugTaskNotFound": "No se pudo encontrar la tarea '{0}'."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..21701a2c2dd
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,56 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Nombre de la extensión",
+	"extension id": "Identificador de la extensión",
+	"preview": "Vista Previa",
+	"builtin": "Integrada",
+	"publisher": "Nombre del editor",
+	"install count": "Número de instalaciones",
+	"rating": "Clasificación",
+	"repository": "Repositorio",
+	"license": "Licencia",
+	"details": "Detalles",
+	"contributions": "Contribuciones",
+	"changelog": "Registro de cambios",
+	"dependencies": "Dependencias",
+	"noReadme": "No hay ningún archivo LÉAME disponible.",
+	"noChangelog": "No hay ningún objeto CHANGELOG disponible.",
+	"noContributions": "No hay contribuciones.",
+	"noDependencies": "No hay dependencias.",
+	"settings": "Configuración ({0})",
+	"setting name": "Nombre",
+	"description": "Descripción",
+	"default": "Predeterminado",
+	"debuggers": "Depuradores ({0})",
+	"debugger name": "Nombre",
+	"debugger type": "Tipo",
+	"views": "Vistas ({0})",
+	"view id": "Id.",
+	"view name": "Nombre",
+	"view location": "Donde",
+	"localizations": "Localizaciones ({0}) ",
+	"localizations language id": "ID. de idioma",
+	"localizations language name": "Nombre de idioma",
+	"localizations localized language name": "Nombre de idioma (localizado)",
+	"defaultDark": "Oscuro por defecto",
+	"defaultLight": "Claro por defecto",
+	"defaultHC": "Contraste alto por defecto",
+	"JSON Validation": "Validación JSON ({0})",
+	"fileMatch": "Coincidencia de archivo",
+	"commands": "Comandos ({0})",
+	"command name": "Nombre",
+	"keyboard shortcuts": "Métodos abreviados de teclado",
+	"menuContexts": "Contextos de menú",
+	"languages": "Lenguajes ({0})",
+	"language id": "Id.",
+	"language name": "Nombre",
+	"file extensions": "Extensiones de archivo",
+	"grammar": "Gramática",
+	"snippets": "Fragmentos"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 7e5657b2ee0..896424f6a2c 100644
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "Recomendado",
 	"otherRecommendedExtensions": "Otras recomendaciones",
 	"workspaceRecommendedExtensions": "Recomendaciones de espacio de trabajo",
-	"builtInExtensions": "Integrado",
 	"searchExtensions": "Buscar extensiones en Marketplace",
 	"sort by installs": "Criterio de ordenación: Número de instalaciones",
 	"sort by rating": "Criterio de ordenación: Clasificación",
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 88a1e52e347..b540790d3f3 100644
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,11 @@
 	"confirmMoveTrashMessageMultiple": "¿Está seguro de que desea eliminar los siguientes archivos {0}?",
 	"confirmMoveTrashMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido?",
 	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
-	"undoBin": "Puede restaurar desde la papelera de reciclaje.",
-	"undoTrash": "Puede restaurar desde la papelera.",
 	"doNotAskAgain": "No volver a preguntarme",
 	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
 	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
 	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
 	"irreversible": "Esta acción es irreversible.",
-	"cancel": "Cancelar",
-	"permDelete": "Eliminar permanentemente",
 	"importFiles": "Importar archivos",
 	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
 	"replaceButtonLabel": "&&Reemplazar",
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..d73134b9c52
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "Vista previa de HTML"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..1709fee8d03
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "Entrada del editor no válida."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..70152293951
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Desarrollador"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..760d6b600cd
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Abrir herramientas de desarrollo de vistas web",
+	"refreshWebviewLabel": "Recargar vistas web"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 27bdc18017a..8d320c3e36d 100644
--- a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "Sí",
+	"no": "No",
+	"doNotAskAgain": "No volver a preguntarme",
 	"JsonSchema.locale": "Idioma de la interfaz de usuario que debe usarse.",
 	"vscode.extension.contributes.localizations": "Contribuye a la localización del editor",
 	"vscode.extension.contributes.localizations.languageId": "Identificador del idioma en el que se traducen las cadenas de visualización.",
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..710a643d6e8
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Copiar",
+	"copyMarkerMessage": "Copiar mensaje"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..4e534a88b7c
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Total {0} Problemas",
+	"filteredProblems": "Mostrando {0} de {1} problemas"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..5f229151f6c
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "Problemas",
+	"tooltip.1": "1 problema en este fichero",
+	"tooltip.N": "{0} problemas en este fichero",
+	"markers.showOnFile": "Mostrar Errores y Advertencias en la carpeta y ficheros."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..eab6272315a
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Ver",
+	"problems.view.toggle.label": "Alternar problemas (errores, advertencias, información)",
+	"problems.view.focus.label": "Problemas de enfoque (errores, advertencias, información)",
+	"problems.panel.configuration.title": "Vista Problemas",
+	"problems.panel.configuration.autoreveal": "Controla si la vista Problemas debe revelar automáticamente los archivos cuando los abre",
+	"markers.panel.title.problems": "Problemas",
+	"markers.panel.aria.label.problems.tree": "Problemas agrupados por archivos",
+	"markers.panel.no.problems.build": "Hasta el momento, no se encontraron problemas en el área de trabajo.",
+	"markers.panel.no.problems.filters": "No se encontraron resultados con los criterios de filtro proporcionados",
+	"markers.panel.action.filter": "Filtrar problemas",
+	"markers.panel.filter.placeholder": "Filtrar por tipo o texto",
+	"markers.panel.filter.errors": "errores",
+	"markers.panel.filter.warnings": "advertencias",
+	"markers.panel.filter.infos": "informaciones",
+	"markers.panel.single.error.label": "1 error",
+	"markers.panel.multiple.errors.label": "{0} errores",
+	"markers.panel.single.warning.label": "1 advertencia",
+	"markers.panel.multiple.warnings.label": "{0} advertencias",
+	"markers.panel.single.info.label": "1 información",
+	"markers.panel.multiple.infos.label": "{0} informaciones",
+	"markers.panel.single.unknown.label": "1 desconocido",
+	"markers.panel.multiple.unknowns.label": "{0} desconocidos",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} con {1} problemas",
+	"errors.warnings.show.label": "Mostrar errores y advertencias"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 7c31eb187d7..e69218c998b 100644
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Mostrar siguiente búsqueda de patrón include",
 	"previousSearchIncludePattern": "Mostrar búsqueda anterior de patrón include ",
-	"nextSearchExcludePattern": "Mostrar siguiente búsqueda de patrón exclude ",
-	"previousSearchExcludePattern": "Mostrar búsqueda anterior de patrón exclude ",
 	"nextSearchTerm": "Mostrar siguiente término de búsqueda",
 	"previousSearchTerm": "Mostrar anterior término de búsqueda",
 	"showSearchViewlet": "Mostrar búsqueda",
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
index 0c3d29ae593..be513ebe447 100644
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Alternar detalles de la búsqueda",
-	"searchScope.includes": "archivos para incluir",
-	"label.includes": "Buscar patrones de inclusión",
-	"searchScope.excludes": "archivos para excluir",
-	"label.excludes": "Buscar patrones de exclusión",
 	"replaceAll.confirmation.title": "Reemplazar todo",
 	"replaceAll.confirm.button": "&&Reemplazar",
 	"replaceAll.occurrence.file.message": "{0} aparición reemplazada en {1} archivo por \"{2}\".",
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 01aace24713..41e40ef4d29 100644
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "No asigna la tarea a ningún grupo",
 	"JsonSchema.tasks.group": "Define a qué grupo de ejecución pertenece esta tarea. Admite \"compilación\" para agregarla al grupo de compilación y \"prueba\" para agregarla al grupo de prueba.",
 	"JsonSchema.tasks.type": "Define si la tarea se ejecuta como un proceso o como un comando dentro de in shell. ",
+	"JsonSchema.command": "El comando que se va a ejecutar. Puede ser un programa externo o un comando shell.",
+	"JsonSchema.tasks.args": "Argumentos que se pasan al comando cuando se invoca esta tarea.",
 	"JsonSchema.tasks.label": "Etiqueta de interfaz de usuario de la tarea",
 	"JsonSchema.version": "El número de versión de la configuración.",
 	"JsonSchema.tasks.identifier": "Un identificador definido por el usuario para hacer referencia a la tarea en launch.json o una cláusula dependsOn.",
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 6613231543f..fb8b41d8a5e 100644
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,10 @@
 	],
 	"tasksCategory": "Tareas",
 	"ConfigureTaskRunnerAction.label": "Configurar tarea",
-	"problems": "Problemas",
+	"totalErrors": "{0} errores",
+	"totalWarnings": "{0} advertencias",
+	"totalInfos": "{0} informaciones",
 	"building": "Compilando...",
-	"manyMarkers": "Más de 99",
 	"runningTasks": "Mostrar tareas en ejecución",
 	"tasks": "Tareas",
 	"TaskSystem.noHotSwap": "Cambiar el motor de ejecución de tareas con una tarea activa ejecutandose, requiere recargar la ventana",
@@ -46,8 +47,8 @@
 	"recentlyUsed": "Tareas usadas recientemente",
 	"configured": "tareas configuradas",
 	"detected": "tareas detectadas",
-	"TaskService.ignoredFolder": "Las siguientes carpetas del área de trabajo se omitirán porque utilizan la versión 0.1.0 de la tarea: {0}",
 	"TaskService.notAgain": "No volver a mostrar",
+	"TaskService.ignoredFolder": "Las siguientes carpetas del área de trabajo se omitirán porque utilizan la versión 0.1.0 de la tarea: {0}",
 	"TaskService.pickRunTask": "Seleccione la tarea a ejecutar",
 	"TaslService.noEntryToRun": "No se encontraron tareas para ejecutar. Configurar tareas...",
 	"TaskService.fetchingBuildTasks": "Obteniendo tareas de compilación...",
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 2b056d507ea..6769f7d66e8 100644
--- a/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Error: la configuración de la tarea '{0}' no contiene la propiedad requerida '{1}'. Se omitirá la configuración de la tarea.",
 	"ConfigurationParser.notCustom": "Error: Las tareas no se declaran como una tarea personalizada. La configuración se omitirá.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Error: Las tareas deben proporcionar una propiedad label. La tarea se ignorará.\n{0}\n",
-	"taskConfiguration.shellArgs": "Advertencia: La tarea '{0}' es un comando de shell y uno de sus argumentos podría tener espacios sin escape. Para asegurarse de que la línea de comandos se cite correctamente, fusione mediante combinación los argumentos en el comando.",
 	"taskConfiguration.noCommandOrDependsOn": "Error: La tarea \"{0}\" no especifica un comando ni una propiedad dependsOn. La tarea se ignorará. Su definición es: \n{1}",
 	"taskConfiguration.noCommand": "Error: La tarea \"{0}\" no define un comando. La tarea se ignorará. Su definición es: {1}",
 	"TaskParse.noOsSpecificGlobalTasks": "La versión de tarea 2.0.0 no admite tareas específicas de SO globales. Conviértalas en una tarea con un comando específico de SO. Estas son las tareas afectadas:\n{0}"
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 900915d6696..f6620b8d489 100644
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copiar",
+	"split": "Dividir",
 	"paste": "Pegar",
 	"selectAll": "Seleccionar todo",
-	"clear": "Borrar",
-	"split": "Dividir"
+	"clear": "Borrar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..0378f2fc8d2
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Notas de la versión: {0}",
+	"unassigned": "sin asignar"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 0c545a6b005..b9e27a328d5 100644
--- a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "Más tarde",
-	"unassigned": "sin asignar",
 	"releaseNotes": "Notas de la versión",
 	"showReleaseNotes": "Mostrar las notas de la versión",
 	"read the release notes": "{0} v{1}. ¿Quiere leer las notas de la versión?",
diff --git a/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..7957a5748f1
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "Editor de vistas web"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..d3fc42e3ea0
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "Leer más"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..e71ac660c5f
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"canNotResolveWorkspaceFolder": "${workspaceFolder} no se puede resolver. Por favor, abra una carpeta.",
+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} no se puede resolver en una área de trabajo de varias carpetas. Establezca el alcance de estas variables usando : y un nombre de carpeta.",
+	"canNotResolveFolderBasename": "${workspaceFolderBasename} no se puede resolver. Por favor, abra una carpeta.",
+	"canNotResolveLineNumber": "${lineNumber} no se puede resolver, por favor, abra un editor.",
+	"canNotResolveSelectedText": "${selectedText} no se puede resolver, por favor, abra un editor.",
+	"canNotResolveFileDirname": "${fileDirname} no se puede resolver, por favor, abra un editor.",
+	"canNotResolveFileExtname": "${fileExtname} no se puede resolver, por favor, abra un editor.",
+	"canNotResolveFileBasename": "${fileBasename} no se puede resolver, por favor, abra un editor.",
+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} no se puede resolver, por favor, abra un editor."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..f78002ce65e
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Sí",
+	"cancelButton": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 3170eed61fb..aa407167dba 100644
--- a/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,7 @@
 	"neverShowAgain": "No volver a mostrar",
 	"netVersionError": "Requiere Microsoft .NET Framework 4.5. Siga el vínculo para instalarlo.",
 	"learnMore": "Instrucciones",
-	"enospcError": "{0} está a punto de agotar los identificadores de archivo. Por favor siga el enlace de instrucciones para resolver este problema.",
+	"enospcError": "{0} es incapaz de observar los cambios de los archivos en este espacio de trabajo tan grande. Por favor siga las instrucciones en el link para resolver este problema.",
 	"binFailed": "No se pudo mover \"{0}\" a la papelera de reciclaje",
 	"trashFailed": "No se pudo mover '{0}' a la papelera"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
index 7f057c36490..69847e82751 100644
--- a/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Recurso de archivo no válido ({0})",
 	"fileIsDirectoryError": "Archivo es el directorio",
 	"fileNotModifiedError": "Archivo no modificado desde",
-	"fileTooLargeForHeapError": "El tamaño del archivo excede el límite de memoria de la ventana, intente ejecutarlo con --max-memory=NUEVOTAMAÑO",
 	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
 	"fileNotFoundError": "Archivo no encontrado ({0})",
 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
diff --git a/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index d599700ac22..07bc99d803d 100644
--- a/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1} ",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Cancelar"
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..56a7e4e867e
--- /dev/null
+++ b/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "Serveur de langage CSS",
+	"folding.start": "Début de la région repliable",
+	"folding.end": "Fin de la région repliable"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css-language-features/package.i18n.json b/i18n/fra/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..8ce650a48c0
--- /dev/null
+++ b/i18n/fra/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Fonctionnalités de langage CSS",
+	"description": "Fournit une prise en charge riche de langage pour les fichiers CSS, LESS et SCSS",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
+	"css.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
+	"css.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
+	"css.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
+	"css.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
+	"css.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
+	"css.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
+	"css.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
+	"css.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
+	"css.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
+	"css.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
+	"css.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
+	"css.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
+	"css.lint.unknownProperties.desc": "Propriété inconnue.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
+	"css.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
+	"css.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
+	"css.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage CSS.",
+	"css.validate.title": "Contrôle la validation CSS et la gravité des problèmes.",
+	"css.validate.desc": "Active ou désactive toutes les validations",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
+	"less.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
+	"less.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
+	"less.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
+	"less.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
+	"less.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
+	"less.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
+	"less.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
+	"less.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
+	"less.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
+	"less.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
+	"less.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
+	"less.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
+	"less.lint.unknownProperties.desc": "Propriété inconnue.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
+	"less.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
+	"less.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
+	"less.validate.title": "Contrôle la validation LESS et la gravité des problèmes.",
+	"less.validate.desc": "Active ou désactive toutes les validations",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
+	"scss.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
+	"scss.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
+	"scss.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
+	"scss.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
+	"scss.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
+	"scss.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
+	"scss.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
+	"scss.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
+	"scss.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
+	"scss.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
+	"scss.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
+	"scss.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
+	"scss.lint.unknownProperties.desc": "Propriété inconnue.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
+	"scss.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
+	"scss.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
+	"scss.validate.title": "Contrôle la validation SCSS et la gravité des problèmes.",
+	"scss.validate.desc": "Active ou désactive toutes les validations",
+	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"css.colorDecorators.enable.deprecationMessage": "Le paramètre 'css.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
+	"scss.colorDecorators.enable.deprecationMessage": "Le paramètre 'scss.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
+	"less.colorDecorators.enable.deprecationMessage": "Le paramètre 'less.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css/package.i18n.json b/i18n/fra/extensions/css/package.i18n.json
index 8ce650a48c0..35229bd6699 100644
--- a/i18n/fra/extensions/css/package.i18n.json
+++ b/i18n/fra/extensions/css/package.i18n.json
@@ -5,77 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Fonctionnalités de langage CSS",
-	"description": "Fournit une prise en charge riche de langage pour les fichiers CSS, LESS et SCSS",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"css.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"css.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"css.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"css.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"css.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"css.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"css.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"css.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"css.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"css.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"css.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"css.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"css.lint.unknownProperties.desc": "Propriété inconnue.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"css.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"css.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"css.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage CSS.",
-	"css.validate.title": "Contrôle la validation CSS et la gravité des problèmes.",
-	"css.validate.desc": "Active ou désactive toutes les validations",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"less.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"less.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"less.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"less.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"less.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"less.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"less.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"less.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"less.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"less.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"less.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"less.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"less.lint.unknownProperties.desc": "Propriété inconnue.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"less.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"less.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"less.validate.title": "Contrôle la validation LESS et la gravité des problèmes.",
-	"less.validate.desc": "Active ou désactive toutes les validations",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"scss.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"scss.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"scss.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"scss.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"scss.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"scss.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"scss.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"scss.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"scss.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"scss.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"scss.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"scss.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"scss.lint.unknownProperties.desc": "Propriété inconnue.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"scss.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"scss.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"scss.validate.title": "Contrôle la validation SCSS et la gravité des problèmes.",
-	"scss.validate.desc": "Active ou désactive toutes les validations",
-	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"css.colorDecorators.enable.deprecationMessage": "Le paramètre 'css.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"scss.colorDecorators.enable.deprecationMessage": "Le paramètre 'scss.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"less.colorDecorators.enable.deprecationMessage": "Le paramètre 'less.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
+	]
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/emmet/package.i18n.json b/i18n/fra/extensions/emmet/package.i18n.json
index 498ecb9bffd..f4abe170d6a 100644
--- a/i18n/fra/extensions/emmet/package.i18n.json
+++ b/i18n/fra/extensions/emmet/package.i18n.json
@@ -59,5 +59,6 @@
 	"emmetPreferencesCssWebkitProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'webkit' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'webkit'.",
 	"emmetPreferencesCssMozProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'moz' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'moz'.",
 	"emmetPreferencesCssOProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'o' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'o'.",
-	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'."
+	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
+	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/commands.i18n.json b/i18n/fra/extensions/git/out/commands.i18n.json
index d64a35734d2..bc93fe05e88 100644
--- a/i18n/fra/extensions/git/out/commands.i18n.json
+++ b/i18n/fra/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "OK",
 	"push with tags success": "Envoyé (push) avec des balises.",
 	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
-	"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
 	"never again": "OK, Ne plus afficher",
 	"no remotes to publish": "Votre dépôt n'a aucun dépôt distant configuré pour une publication.",
 	"no changes stash": "Aucune modification à remiser (stash).",
diff --git a/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..9d334931d10
--- /dev/null
+++ b/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "Serveur de langage HTML",
+	"folding.start": "Début de la région repliable",
+	"folding.end": "Fin de la région repliable"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html-language-features/package.i18n.json b/i18n/fra/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..d94c280aaad
--- /dev/null
+++ b/i18n/fra/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Fonctionnalités de langage HTML",
+	"description": "Fournit une prise en charge riche de langage pour HTML, Razor et les fichiers Handlebar.",
+	"html.format.enable.desc": "Activer/désactiver le formateur HTML par défaut.",
+	"html.format.wrapLineLength.desc": "Nombre maximal de caractères par ligne (0 = désactiver).",
+	"html.format.unformatted.desc": "Liste des balises, séparées par des virgules, qui ne doivent pas être remises en forme. 'null' correspond par défaut à toutes les balises répertoriées à l'adresse https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Liste des balises, séparées par des virgules, dont le contenu ne doit pas être remis en forme. 'null' correspond par défaut à toutes les balises 'pre'.",
+	"html.format.indentInnerHtml.desc": "Mettez en retrait les sections <head> et <body>.",
+	"html.format.preserveNewLines.desc": "Spécifie si les sauts de ligne existants qui précèdent les éléments doivent être conservés. Fonctionne uniquement devant les éléments, pas dans les balises, ni pour du texte.",
+	"html.format.maxPreserveNewLines.desc": "Nombre maximal de sauts de ligne à conserver dans un bloc. Utilisez 'null' pour indiquer une valeur illimitée.",
+	"html.format.indentHandlebars.desc": "Mettez en forme et en retrait {{#foo}}, ainsi que {{/foo}}.",
+	"html.format.endWithNewline.desc": "Finissez par un caractère de nouvelle ligne.",
+	"html.format.extraLiners.desc": "Liste de balises, séparées par une virgule, qui doivent être précédées d'une nouvelle ligne. 'null' prend par défaut la valeur \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Retour à la ligne des attributs.",
+	"html.format.wrapAttributes.auto": "Retour automatique à la ligne des attributs uniquement en cas de dépassement de la longueur de la ligne.",
+	"html.format.wrapAttributes.force": "Retour automatique à la ligne de chaque attribut, sauf le premier.",
+	"html.format.wrapAttributes.forcealign": "Retour automatique à la ligne de chaque attribut, sauf le premier, avec maintien de l'alignement.",
+	"html.format.wrapAttributes.forcemultiline": "Retour automatique à la ligne de chaque attribut.",
+	"html.suggest.angular1.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises et propriétés Angular V1.",
+	"html.suggest.ionic.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs Ionic.",
+	"html.suggest.html5.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs HTML5.",
+	"html.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage HTML.",
+	"html.validate.scripts": "Configure la validation des scripts incorporés par la prise en charge du langage HTML intégré.",
+	"html.validate.styles": "Configure la validation des styles incorporés par la prise en charge du langage HTML intégré.",
+	"html.autoClosingTags": "Activez/désactivez la fermeture automatique des balises HTML."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html/package.i18n.json b/i18n/fra/extensions/html/package.i18n.json
index d206c104a1a..23dcd2b8cfb 100644
--- a/i18n/fra/extensions/html/package.i18n.json
+++ b/i18n/fra/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Fonctionnalités de langage HTML",
-	"description": "Fournit une prise en charge riche de langage pour HTML, Razor et les fichiers Handlebar.",
-	"html.format.enable.desc": "Activer/désactiver le formateur HTML par défaut.",
-	"html.format.wrapLineLength.desc": "Nombre maximal de caractères par ligne (0 = désactiver).",
-	"html.format.unformatted.desc": "Liste des balises, séparées par des virgules, qui ne doivent pas être remises en forme. 'null' correspond par défaut à toutes les balises répertoriées à l'adresse https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Liste des balises, séparées par des virgules, dont le contenu ne doit pas être remis en forme. 'null' correspond par défaut à toutes les balises 'pre'.",
-	"html.format.indentInnerHtml.desc": "Mettez en retrait les sections <head> et <body>.",
-	"html.format.preserveNewLines.desc": "Spécifie si les sauts de ligne existants qui précèdent les éléments doivent être conservés. Fonctionne uniquement devant les éléments, pas dans les balises, ni pour du texte.",
-	"html.format.maxPreserveNewLines.desc": "Nombre maximal de sauts de ligne à conserver dans un bloc. Utilisez 'null' pour indiquer une valeur illimitée.",
-	"html.format.indentHandlebars.desc": "Mettez en forme et en retrait {{#foo}}, ainsi que {{/foo}}.",
-	"html.format.endWithNewline.desc": "Finissez par un caractère de nouvelle ligne.",
-	"html.format.extraLiners.desc": "Liste de balises, séparées par une virgule, qui doivent être précédées d'une nouvelle ligne. 'null' prend par défaut la valeur \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Retour à la ligne des attributs.",
-	"html.format.wrapAttributes.auto": "Retour automatique à la ligne des attributs uniquement en cas de dépassement de la longueur de la ligne.",
-	"html.format.wrapAttributes.force": "Retour automatique à la ligne de chaque attribut, sauf le premier.",
-	"html.format.wrapAttributes.forcealign": "Retour automatique à la ligne de chaque attribut, sauf le premier, avec maintien de l'alignement.",
-	"html.format.wrapAttributes.forcemultiline": "Retour automatique à la ligne de chaque attribut.",
-	"html.suggest.angular1.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises et propriétés Angular V1.",
-	"html.suggest.ionic.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs Ionic.",
-	"html.suggest.html5.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs HTML5.",
-	"html.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage HTML.",
-	"html.validate.scripts": "Configure la validation des scripts incorporés par la prise en charge du langage HTML intégré.",
-	"html.validate.styles": "Configure la validation des styles incorporés par la prise en charge du langage HTML intégré.",
-	"html.experimental.syntaxFolding": "Active/désactive les marqueurs de réduction en fonction de la syntaxe.",
-	"html.autoClosingTags": "Activez/désactivez la fermeture automatique des balises HTML."
+	"displayName": "Notions de base du langage HTML",
+	"description": "Fournit la coloration syntaxique, la correspondance des balises d'ouverture et de fermeture et des extraits de code dans les fichiers HTML."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..bd80392eb07
--- /dev/null
+++ b/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "Serveur de langage JSON"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json-language-features/package.i18n.json b/i18n/fra/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..9b182858ced
--- /dev/null
+++ b/i18n/fra/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Fonctionnalités de langage JSON",
+	"description": "Fournit une prise en charge de langage pour les fichiers JSON",
+	"json.schemas.desc": "Associer les schémas aux fichiers JSON dans le projet actif",
+	"json.schemas.url.desc": "URL de schéma ou chemin relatif d'un schéma dans le répertoire actif",
+	"json.schemas.fileMatch.desc": "Tableau de modèles de fichiers pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
+	"json.schemas.fileMatch.item.desc": "Modèle de fichier pouvant contenir '*' pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
+	"json.schemas.schema.desc": "Définition de schéma pour l'URL indiquée. Le schéma doit être fourni uniquement pour éviter les accès à l'URL du schéma.",
+	"json.format.enable.desc": "Activer/désactiver le formateur JSON par défaut (nécessite un redémarrage)",
+	"json.tracing.desc": "Trace la communication entre VS Code et le serveur de langage JSON.",
+	"json.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"json.colorDecorators.enable.deprecationMessage": "Le paramètre 'json.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json/package.i18n.json b/i18n/fra/extensions/json/package.i18n.json
index 9eda719884e..91f8d80320a 100644
--- a/i18n/fra/extensions/json/package.i18n.json
+++ b/i18n/fra/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Fonctionnalités de langage JSON",
-	"description": "Fournit une prise en charge de langage pour les fichiers JSON",
-	"json.schemas.desc": "Associer les schémas aux fichiers JSON dans le projet actif",
-	"json.schemas.url.desc": "URL de schéma ou chemin relatif d'un schéma dans le répertoire actif",
-	"json.schemas.fileMatch.desc": "Tableau de modèles de fichiers pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-	"json.schemas.fileMatch.item.desc": "Modèle de fichier pouvant contenir '*' pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-	"json.schemas.schema.desc": "Définition de schéma pour l'URL indiquée. Le schéma doit être fourni uniquement pour éviter les accès à l'URL du schéma.",
-	"json.format.enable.desc": "Activer/désactiver le formateur JSON par défaut (nécessite un redémarrage)",
-	"json.tracing.desc": "Trace la communication entre VS Code et le serveur de langage JSON.",
-	"json.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"json.colorDecorators.enable.deprecationMessage": "Le paramètre 'json.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"json.experimental.syntaxFolding": "Active/désactive les marqueurs de réduction en fonction de la syntaxe."
+	"displayName": "Bases du langage JSON",
+	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers JSON."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..69d5cb1c1f2
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "Impossible de charger 'markdown.styles' : {0}"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..9e9f654e2f9
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[Aperçu] {0}",
+	"previewTitle": "Prévisualiser {0}"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..38a6bf3c24e
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "Du contenu a été désactivé dans ce document",
+	"preview.securityMessage.title": "Le contenu potentiellement dangereux ou précaire a été désactivé dans l’aperçu du format markdown. Modifier le paramètre de sécurité Aperçu Markdown afin d’autoriser les contenus non sécurisés ou activer les scripts",
+	"preview.securityMessage.label": "Avertissement de sécurité de contenu désactivé"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/security.i18n.json b/i18n/fra/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..29ca6d0b4cb
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Charger uniquement le contenu sécurisé.",
+	"insecureContent.title": "Autoriser le contenu non sécurisé",
+	"insecureContent.description": "Activer le chargement de contenu sur http",
+	"disable.title": "Désactiver",
+	"disable.description": "Autorisez tout le contenu et l’exécution des scripts. Non recommandé",
+	"moreInfo.title": "Informations",
+	"enableSecurityWarning.title": "Activer l'aperçu d'avertissements de sécurité pour cet espace de travail",
+	"disableSecurityWarning.title": "Désactiver l'aperçu d'avertissements de sécurité pour cet espace de travail",
+	"toggleSecurityWarning.description": "N'affecte pas le niveau de sécurité de contenu",
+	"preview.showPreviewSecuritySelector.title": "Sélectionner les paramètres de sécurité pour les aperçus Markdown dans cet espace de travail"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/package.i18n.json b/i18n/fra/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..f5aede8507b
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Fonctionnalités de langage Markdown",
+	"description": "Fournit une prise en charge riche de langage pour Markdown",
+	"markdown.preview.breaks.desc": "Définit l'affichage des sauts de ligne dans l'aperçu Markdown. Si la valeur est 'true', crée un <br> pour chaque nouvelle ligne.",
+	"markdown.preview.linkify": "Activez ou désactivez la conversion de texte de type URL en liens dans l’aperçu Markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double-cliquez dans l'aperçu Markdown pour passer à l'éditeur.",
+	"markdown.preview.fontFamily.desc": "Contrôle la famille de polices utilisée dans l'aperçu Markdown.",
+	"markdown.preview.fontSize.desc": "Contrôle la taille de police en pixels utilisée dans l'aperçu Markdown.",
+	"markdown.preview.lineHeight.desc": "Contrôle la hauteur de ligne utilisée dans l'aperçu Markdown. Ce nombre est relatif à la taille de police.",
+	"markdown.preview.markEditorSelection.desc": "Permet de marquer la sélection actuelle de l'éditeur dans l'aperçu Markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Lors du défilement de l'aperçu markdown, actualiser l’affichage de l’éditeur.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Lors du défilement d’un éditeur markdow, actualiser l’affichage de l’aperçu.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Déprécié] Fait défiler l'aperçu Markdown pour révéler la ligne actuellement sélectionnée dans l'éditeur.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ce paramètre a été remplacé par 'markdown.preview.scrollPreviewWithEditor' et n'a plus aucun effet.",
+	"markdown.preview.title": "Ouvrir l'aperçu",
+	"markdown.previewFrontMatter.dec": "Définit comment les pages liminaires YAML doivent être affichées dans l'aperçu Markdown. L'option 'hide' supprime les pages liminaires. Sinon, elles sont traitées comme du contenu Markdown.",
+	"markdown.previewSide.title": "Ouvrir l'aperçu sur le côté",
+	"markdown.showLockedPreviewToSide.title": "Ouvrir l'aperçu verrrouillé sur le côté",
+	"markdown.showSource.title": "Afficher la source",
+	"markdown.styles.dec": "Liste d'URL ou de chemins locaux de feuilles de style CSS à utiliser dans l'aperçu Markdown. Les chemins relatifs sont interprétés par rapport au dossier ouvert dans l'explorateur. S'il n'y a aucun dossier ouvert, ils sont interprétés par rapport à l'emplacement du fichier Markdown. Tous les signes '\\' doivent être écrits sous la forme '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Changer les paramètres de sécurité de l'aperçu",
+	"markdown.trace.desc": "Active la journalisation du débogage pour l'extension Markdown.",
+	"markdown.preview.refresh.title": "Actualiser l'aperçu",
+	"markdown.preview.toggleLock.title": "Activer/désactiver le verrouillage de l'aperçu"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..b20a0679e61
--- /dev/null
+++ b/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "Autorisez-vous l'exécution de {0} (défini en tant que paramètre d'espace de travail) pour effectuer une validation lint sur les fichiers PHP ?",
+	"php.yes": "Autoriser",
+	"php.no": "Interdire",
+	"wrongExecutable": "Impossible d'effectuer la validation, car {0} n'est pas un exécutable PHP valide. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
+	"noExecutable": "Impossible d'effectuer la validation, car aucun exécutable PHP n'est défini. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
+	"unknownReason": "Échec de l'exécution de php avec le chemin : {0}. Raison inconnue."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php-language-features/package.i18n.json b/i18n/fra/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..f69ece2bdd4
--- /dev/null
+++ b/i18n/fra/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,17 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Configure l'activation ou la désactivation des suggestions de langage PHP intégrées. La fonctionnalité de prise en charge suggère les variables globales et les variables de session PHP.",
+	"configuration.validate.enable": "Activez/désactivez la validation PHP intégrée.",
+	"configuration.validate.executablePath": "Pointe vers l'exécutable PHP.",
+	"configuration.validate.run": "Spécifie si linter est exécuté au moment de l'enregistrement ou de la saisie.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Interdire l'exécutable de validation PHP (défini comme paramètre d'espace de travail)",
+	"displayName": "Fonctionnalités de langage PHP"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php/package.i18n.json b/i18n/fra/extensions/php/package.i18n.json
index 38ff61530b7..20a77bf9902 100644
--- a/i18n/fra/extensions/php/package.i18n.json
+++ b/i18n/fra/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Configure l'activation ou la désactivation des suggestions de langage PHP intégrées. La fonctionnalité de prise en charge suggère les variables globales et les variables de session PHP.",
-	"configuration.validate.enable": "Activez/désactivez la validation PHP intégrée.",
-	"configuration.validate.executablePath": "Pointe vers l'exécutable PHP.",
-	"configuration.validate.run": "Spécifie si linter est exécuté au moment de l'enregistrement ou de la saisie.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Interdire l'exécutable de validation PHP (défini comme paramètre d'espace de travail)",
-	"displayName": "Fonctionnalités du langage PHP",
-	"description": "Fournit IntelliSense, le linting et les concepts de base de langage pour les fichiers PHP."
+	"displayName": "Fonctionnalités du langage PHP"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 4372aeafc54..a1fd534cd5e 100644
--- a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "Résultats introuvables",
 	"settingsSearchIssue": "Problème de paramètres de recherche",
 	"bugReporter": "Rapporteur de bogue",
-	"performanceIssue": "Problème de performance",
 	"featureRequest": "Demande de fonctionnalité",
+	"performanceIssue": "Problème de performance",
 	"stepsToReproduce": "Étapes à reproduire",
 	"bugDescription": "Partagez les étapes nécessaires pour reproduire fidèlement le problème. Veuillez inclure les résultats réels et prévus. Nous prenons en charge la syntaxe GitHub Markdown. Vous pourrez éditer votre problème et ajouter des captures d'écran lorsque nous le prévisualiserons sur GitHub.",
 	"performanceIssueDesciption": "Quand ce problème de performance s'est-il produit ? Se produit-il au démarrage ou après une série d'actions spécifiques ? Nous prenons en charge la syntaxe Markdown de GitHub. Vous pourrez éditer votre problème et ajouter des captures d'écran lorsque nous le prévisualiserons sur GitHub.",
diff --git a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
index f429643db53..3b0bc493515 100644
--- a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,7 @@
 	"warningBorder": "Couleur de bordure de la ligne ondulée marquant les avertissements dans l'éditeur.",
 	"infoForeground": "Couleur de premier plan de la ligne ondulée marquant les informations dans l'éditeur.",
 	"infoBorder": "Couleur de bordure de la ligne ondulée marquant les informations dans l'éditeur.",
-	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de plage.",
+	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour des plages mises en surbrillance. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
 	"overviewRuleError": "Couleur du marqueur de la règle d'aperçu pour les erreurs.",
 	"overviewRuleWarning": "Couleur du marqueur de la règle d'aperçu pour les avertissements.",
 	"overviewRuleInfo": "Couleur du marqueur de la règle d'aperçu pour les informations."
diff --git a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index d76f9865b2b..f73761c7817 100644
--- a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Aller au problème suivant (Erreur, Avertissement, Info)",
-	"markerAction.previous.label": "Aller au problème précédent (Erreur, Avertissement, Info)",
-	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
-	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
+	"markerAction.previous.label": "Aller au problème précédent (Erreur, Avertissement, Info)"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..9d9cfafff38
--- /dev/null
+++ b/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
+	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
+	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
+	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..eda9d2905d6
--- /dev/null
+++ b/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"Sunday": "Dimanche",
+	"Monday": "Lundi",
+	"Tuesday": "Mardi",
+	"Wednesday": "Mercredi",
+	"Thursday": "Jeudi",
+	"Friday": "Vendredi",
+	"Saturday": "Samedi",
+	"SeptemberShort": "Sep",
+	"OctoberShort": "Oct",
+	"NovemberShort": "Nov",
+	"DecemberShort": "Déc"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 01d606a017d..0eab06eb685 100644
--- a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Couleur d'arrière-plan d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
 	"wordHighlightBorder": "Couleur de bordure d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable.",
 	"wordHighlightStrongBorder": "Couleur de bordure d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable.",
-	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de symbole.",
-	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu la mise en évidence de symbole d’accès en écriture.",
+	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
+	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole d'accès en écriture. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
 	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
 	"wordHighlight.previous.label": "Aller à la mise en évidence de symbole précédente"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..40bf02755c5
--- /dev/null
+++ b/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 fichier supplémentaire non affiché",
+	"moreFiles": "...{0} fichiers supplémentaires non affichés"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..2f086ccc7a3
--- /dev/null
+++ b/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "Annuler"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 705af653f74..65d0af43d0c 100644
--- a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Erreur lors de l'installation des dépendances. {0}",
 	"MarketPlaceDisabled": "Le marketplace n’est pas activé",
 	"removeError": "Erreur lors de la suppression de l’extension : {0}. Veuillez quitter et relancer VS Code avant de réessayer.",
-	"Not Market place extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
+	"Not a Marketplace extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
 	"notFoundCompatible": "Impossible d’installer '{0}'; Il n’y a pas de version disponible compatible avec VS Code '{1}'.",
 	"malicious extension": "Impossible d’installer l'extension car elle a été signalée comme problématique.",
 	"notFoundCompatibleDependency": "Installation impossible car l'extension dépendante '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.",
 	"quitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît quitter et redémarrer VS Code avant de le réinstaller.",
 	"exitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît sortir et redémarrer VS Code avant de le réinstaller.",
 	"uninstallDependeciesConfirmation": "Voulez-vous désinstaller uniquement '{0}' ou également ses dépendances ?",
-	"uninstallOnly": "Uniquement",
-	"uninstallAll": "Tout",
+	"uninstallOnly": "Extension uniquement",
+	"uninstallAll": "Tout désinstaller",
 	"uninstallConfirmation": "Voulez-vous vraiment désinstaller '{0}' ?",
 	"ok": "OK",
 	"singleDependentError": "Impossible de désinstaller l'extension '{0}'. L'extension '{1}' en dépend.",
diff --git a/i18n/fra/src/vs/platform/list/browser/listService.i18n.json b/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
index e512ed15ca9..79767f92ca9 100644
--- a/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Le modificateur à utiliser pour ajouter un élément à une multi-sélection avec la souris (par exemple dans l’Explorateur, des éditeurs ouverts et scm view). 'ctrlCmd' mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS. Les mouvements de souris 'Ouvrir sur le côté', si supportés, s'adaptent pour ne pas entrer en conflit avec le modificateur multiselect.",
 	"openMode.singleClick": "Ouvre les éléments sur un simple clic de souris.",
 	"openMode.doubleClick": "Ouvre les éléments sur un double clic de souris.",
-	"openModeModifier": "Contrôle l’ouverture des éléments dans les arbres et listes à l’aide de la souris (si pris en charge). Mettre la valeur `singleClick` pour ouvrir des éléments avec un simple clic de souris et `doubleClick` pour ouvrir uniquement via un double-clic de souris. Pour les parents ayant des enfants dans les arbres, ce paramètre contrôle si un simple clic développe le parent ou un double-clic. Notez que certains arbres et listes peuvent choisir d’ignorer ce paramètre, si ce n’est pas applicable. "
+	"openModeModifier": "Contrôle l’ouverture des éléments dans les arbres et listes à l’aide de la souris (si pris en charge). Mettre la valeur `singleClick` pour ouvrir des éléments avec un simple clic de souris et `doubleClick` pour ouvrir uniquement via un double-clic de souris. Pour les parents ayant des enfants dans les arbres, ce paramètre contrôle si un simple clic développe le parent ou un double-clic. Notez que certains arbres et listes peuvent choisir d’ignorer ce paramètre, si ce n’est pas applicable. ",
+	"horizontalScrolling setting": "Contrôle si les arborescences prennent en charge le défilement horizontal dans le plan de travail."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/markers/common/markers.i18n.json b/i18n/fra/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..634b6c772a7
--- /dev/null
+++ b/i18n/fra/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Erreur",
+	"sev.warning": "Avertissement",
+	"sev.info": "Informations"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
index a31359353cc..23d1737cd7a 100644
--- a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Premier plan de la règle d'aperçu actuelle pour les conflits de fusion inline.",
 	"overviewRulerIncomingContentForeground": "Premier plan de la règle d'aperçu entrante pour les conflits de fusion inline.",
 	"overviewRulerCommonContentForeground": "Arrière-plan de la règle d'aperçu de l'ancêtre commun dans les conflits de fusion inline.",
-	"overviewRulerFindMatchForeground": "Couleur du marqueur de la règle d'aperçu pour rechercher des correspondances.",
-	"overviewRulerSelectionHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de la sélection."
+	"overviewRulerFindMatchForeground": "Couleur du marqueur de la règle d'aperçu pour les correspondances trouvées. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
+	"overviewRulerSelectionHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de sélection. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..5f508cf00b5
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0} : {1}"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..ba3f3014580
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"extensionSource": "{0} (Extension)"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 2bc5f99bcfc..1cdd98b12a7 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Focus sur le groupe suivant",
 	"openToSide": "Ouvrir sur le côté",
 	"closeEditor": "Fermer l'éditeur",
+	"closeOneEditor": "Fermer",
 	"revertAndCloseActiveEditor": "Restaurer et fermer l'éditeur",
 	"closeEditorsToTheLeft": "Fermer les éditeurs situés à gauche",
 	"closeAllEditors": "Fermer tous les éditeurs",
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 5844230292f..628561d4d2c 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Fermer",
 	"araLabelEditorActions": "Actions de l'éditeur"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
index b87604490e8..ef97b82ec54 100644
--- a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,13 @@
 	"windowConfigurationTitle": "Fenêtre",
 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
 	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
-	"window.openFilesInNewWindow.default": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active, sauf s'ils sont ouverts via le Dock ou depuis le Finder (macOS uniquement)",
-	"openFilesInNewWindow": "Contrôle si les fichiers doivent s'ouvrir dans une nouvelle fenêtre.\n- default : les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active, sauf s'ils sont ouverts via le Dock ou depuis le Finder (macOS uniquement)\n- on : les fichiers s'ouvrent dans une nouvelle fenêtre\n- off : les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active\nNotez que dans certains cas, ce paramètre est ignoré (par exemple, quand vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
+	"window.openFilesInNewWindow.defaultMac": "Les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active, à moins qu'ils ne soient ouverts via le Dock ou depuis Finder.",
+	"window.openFilesInNewWindow.default": "Les fichiers s'ouvriront dans une nouvelle fenêtre, à moins qu'ils ne soient sélectionnés dans l'application (par ex. via le menu Fichier)",
 	"window.openFoldersInNewWindow.on": "Les dossiers s'ouvrent dans une nouvelle fenêtre",
 	"window.openFoldersInNewWindow.off": "Les dossiers remplacent la dernière fenêtre active",
 	"window.openFoldersInNewWindow.default": "Les dossiers s'ouvrent dans une nouvelle fenêtre, sauf si un dossier est sélectionné depuis l'application (par exemple, via le menu Fichier)",
 	"openFoldersInNewWindow": "Contrôle si les dossiers doivent s'ouvrir dans une nouvelle fenêtre ou remplacer la dernière fenêtre active.\n- default : les dossiers s'ouvrent dans une nouvelle fenêtre, sauf si un dossier est sélectionné depuis l'application (par exemple, via le menu Fichier)\n- on : les dossiers s'ouvrent dans une nouvelle fenêtre\n- off : les dossiers remplacent la dernière fenêtre active\nNotez que dans certains cas, ce paramètre est ignoré (par exemple, quand vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
+	"window.openWithoutArgumentsInNewWindow.on": "Ouvrir une nouvelle fenêtre vide",
 	"window.reopenFolders.all": "Rouvre toutes les fenêtres.",
 	"window.reopenFolders.folders": "Rouvrir tous les dossiers. Les espaces de travail vides ne seront pas restaurées.",
 	"window.reopenFolders.one": "Rouvre la dernière fenêtre active.",
@@ -58,7 +59,6 @@
 	"restoreWindows": "Contrôle comment les fenêtres seront rouvertes après un redémarrage. Sélectionner 'none' pour toujours démarrer avec un espace de travail vide, 'one' pour rouvrir la dernière fenêtre avec laquelle vous avez travaillé, 'folders' pour rouvrir toutes les fenêtres qui avaient des dossiers ouverts  ou 'all' pour rouvrir toutes les fenêtres de votre dernière session.",
 	"restoreFullscreen": "Contrôle si une fenêtre doit être restaurée en mode plein écran si elle a été fermée dans ce mode.",
 	"zoomLevel": "Modifiez le niveau de zoom de la fenêtre. La taille d'origine est 0. Chaque incrément supérieur (exemple : 1) ou inférieur (exemple : -1) représente un zoom 20 % plus gros ou plus petit. Vous pouvez également entrer des décimales pour changer le niveau de zoom avec une granularité plus fine.",
-	"title": "Contrôle le titre de la fenêtre en fonction sur l’éditeur actif. Les variables sont remplacés selon le contexte : ${activeEditorShort} : le nom du fichier (ex: monFichier.txt) ${activeEditorMedium} : le chemin d’accès au fichier par rapport au dossier de l’espace de travail (ex: monDossier/monFichier.txt) ${activeEditorLong} : le chemin d’accès complet du fichier (par exemple / Users/Developpement/monDossier/monFichier.txt) ${folderName} : nom du dossier de l’espace de travail auquel le fichier appartient (ex: mondossier) ${folderPath} : chemin d’accès du dossier de l'espace de travail auquel le fichier appartient (ex: /Users/Developpement/monDossier) {$ rootName} : nom de l’espace de travail (:. monDossier ou monEspaceDeTravail) ${rootPath} : chemin d’accès de l’espace de travail (ex: /Users/Developpement/monEspaceDeTravail) ${appName} : ex. VS Code  ${dirty} : un indicateur si l’éditeur actif est modifié ${separator} : un séparateur conditionnel (\" - \") qui ne s'affiche que quand ils sont entourés par des variables avec des valeurs",
 	"window.newWindowDimensions.default": "Permet d'ouvrir les nouvelles fenêtres au centre de l'écran.",
 	"window.newWindowDimensions.inherit": "Permet d'ouvrir les nouvelles fenêtres avec la même dimension que la dernière fenêtre active.",
 	"window.newWindowDimensions.maximized": "Permet d'ouvrir les nouvelles fenêtres de manière agrandie.",
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index a1ba3461445..c216d242008 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Redémarrer le frame",
 	"removeBreakpoint": "Supprimer un point d'arrêt",
 	"removeAllBreakpoints": "Supprimer tous les points d'arrêt",
-	"enableBreakpoint": "Activer le point d'arrêt",
-	"disableBreakpoint": "Désactiver le point d'arrêt",
 	"enableAllBreakpoints": "Activer tous les points d'arrêt",
 	"disableAllBreakpoints": "Désactiver tous les points d'arrêt",
 	"activateBreakpoints": "Activer les points d'arrêt",
 	"deactivateBreakpoints": "Désactiver les points d'arrêt",
 	"reapplyAllBreakpoints": "Réappliquer tous les points d'arrêt",
 	"addFunctionBreakpoint": "Ajouter un point d'arrêt sur fonction",
-	"addConditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
-	"editConditionalBreakpoint": "Modifier un point d'arrêt...",
 	"setValue": "Définir la valeur",
 	"addWatchExpression": "Ajouter une expression",
 	"editWatchExpression": "Modifier l'expression",
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..bd3746f483c
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
+	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
+	"breakpointWidgetHitCountAriaLabel": "Le programme s'arrête ici uniquement si le nombre d'accès est atteint. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
+	"breakpointWidgetAriaLabel": "Le programme s'arrête ici uniquement si cette condition a la valeur true. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
+	"expression": "Expression",
+	"hitCount": "Nombre d'accès"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 7e373cfa04c..2cdcf5ae1aa 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Modifier un point d'arrêt...",
+	"disableBreakpoint": "Désactiver le point d'arrêt",
+	"enableBreakpoint": "Activer le point d'arrêt",
 	"removeBreakpoints": "Supprimer les points d'arrêt",
 	"removeBreakpointOnColumn": "Supprimer le point d'arrêt de la colonne {0}",
 	"removeLineBreakpoint": "Supprimer le point d'arrêt de la ligne",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "Activer le point d'arrêt de la colonne {0}",
 	"enableBreakpointOnLine": "Activer le point d'arrêt de la ligne",
 	"addBreakpoint": "Ajouter un point d'arrêt",
+	"conditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
 	"addConfiguration": "Ajouter une configuration..."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 3e89fe28373..d6c47b100cd 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,5 @@
 	"showErrors": "Afficher les erreurs",
 	"noFolderWorkspaceDebugError": "Impossible de déboguer le fichier actif. Vérifiez qu'il est enregistré sur le disque et qu'une extension de débogage est installée pour ce type de fichier.",
 	"cancel": "Annuler",
-	"DebugTaskNotFound": "preLaunchTask '{0}' introuvable.",
-	"taskNotTracked": "La tâche de prélancement '{0}' n'a pas pu être tracée."
+	"DebugTaskNotFound": "Tâche '{0}' introuvable."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..c68f4a91092
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,55 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Nom de l'extension",
+	"extension id": "Identificateur d'extension",
+	"builtin": "Intégrée",
+	"publisher": "Nom de l'éditeur",
+	"install count": "Nombre d'installations",
+	"rating": "Évaluation",
+	"repository": "Dépôt",
+	"license": "Licence",
+	"details": "Détails",
+	"contributions": "Contributions",
+	"changelog": "Journal des modifications",
+	"dependencies": "Dépendances",
+	"noReadme": "Aucun fichier README disponible.",
+	"noChangelog": "Aucun Changelog disponible.",
+	"noContributions": "Aucune contribution",
+	"noDependencies": "Aucune dépendance",
+	"settings": "Paramètres ({0})",
+	"setting name": "Nom",
+	"description": "Description",
+	"default": "Par défaut",
+	"debuggers": "Débogueurs ({0})",
+	"debugger name": "Nom",
+	"debugger type": "Type",
+	"views": "Vues ({0})",
+	"view id": "ID",
+	"view name": "Nom",
+	"view location": "Emplacement",
+	"localizations": "Localisations ({0})",
+	"localizations language name": "Nom de langue",
+	"localizations localized language name": "Nom de langue (localisé)",
+	"colorId": "Id",
+	"defaultDark": "Défaut pour le thème sombre",
+	"defaultLight": "Défaut pour le thème clair",
+	"defaultHC": "Défaut pour le thème de contraste élevé",
+	"JSON Validation": "Validation JSON ({0})",
+	"fileMatch": "Correspondance de fichier",
+	"commands": "Commandes ({0})",
+	"command name": "Nom",
+	"keyboard shortcuts": "Raccourcis clavier",
+	"menuContexts": "Contextes de menu",
+	"languages": "Langages ({0})",
+	"language id": "ID",
+	"language name": "Nom",
+	"file extensions": "Extensions de fichier",
+	"grammar": "Grammaire",
+	"snippets": "Extraits"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 518cd664a2e..557f45e5910 100644
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "Recommandées",
 	"otherRecommendedExtensions": "Autres recommandations",
 	"workspaceRecommendedExtensions": "Recommandations de l’espace de travail",
-	"builtInExtensions": "Intégrée",
 	"searchExtensions": "Rechercher des extensions dans Marketplace",
 	"sort by installs": "Trier par : nombre d'installations",
 	"sort by rating": "Trier par : évaluation",
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 744c7215953..a31359c7486 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,11 @@
 	"confirmMoveTrashMessageMultiple": "Êtes-vous sûr de vouloir supprimer les fichiers {0} suivants ?",
 	"confirmMoveTrashMessageFolder": "Voulez-vous vraiment supprimer '{0}' et son contenu ?",
 	"confirmMoveTrashMessageFile": "Voulez-vous vraiment supprimer '{0}' ?",
-	"undoBin": "Vous pouvez effectuer une restauration à partir de la Corbeille.",
-	"undoTrash": "Vous pouvez effectuer une restauration à partir de la Poubelle.",
 	"doNotAskAgain": "Ne plus me demander",
 	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
 	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
 	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
 	"irreversible": "Cette action est irréversible !",
-	"cancel": "Annuler",
-	"permDelete": "Supprimer définitivement",
 	"importFiles": "Importer des fichiers",
 	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
 	"replaceButtonLabel": "&&Remplacer",
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..2af49cbd741
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "Aperçu HTML"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..eaf9eb82e46
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "Entrée d'éditeur non valide."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..dfefdfa0bf8
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Développeur"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..09dc4357050
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Ouvrir les outils de développement Webview",
+	"refreshWebviewLabel": "Recharger les Webviews"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 99d56e82804..76289731369 100644
--- a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "Oui",
+	"no": "Non",
+	"doNotAskAgain": "Ne plus me demander",
 	"JsonSchema.locale": "Langue d'interface utilisateur (IU) à utiliser.",
 	"vscode.extension.contributes.localizations": "Contribuer aux localisations de l’éditeur",
 	"vscode.extension.contributes.localizations.languageId": "Id de la langue dans laquelle les chaînes d’affichage sont traduites.",
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..7e415dbd6de
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Copier"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..556e096a283
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Total de {0} problèmes",
+	"filteredProblems": "Affichage de {0} sur {1} problèmes"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..0f826a200bb
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "Problèmes",
+	"tooltip.N": "{0} problèmes dans ce fichier",
+	"markers.showOnFile": "Afficher les erreurs & les avertissements sur les fichiers et dossiers."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..ced53cc49d4
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Affichage",
+	"problems.view.toggle.label": "Activer/désactiver les problèmes (Erreurs, Avertissements, Infos)",
+	"problems.view.focus.label": " Focus sur les problèmes (Erreurs, Avertissements, Infos)",
+	"problems.panel.configuration.title": "Affichage des problèmes",
+	"problems.panel.configuration.autoreveal": "Contrôle si l'affichage des problèmes doit automatiquement montrer les fichiers quand il les ouvre",
+	"markers.panel.title.problems": "Problèmes",
+	"markers.panel.aria.label.problems.tree": "Problèmes regroupés par fichiers",
+	"markers.panel.no.problems.build": "Aucun problème n'a été détecté dans l'espace de travail jusqu'à présent.",
+	"markers.panel.no.problems.filters": "Résultats introuvables avec les critères de filtre fournis",
+	"markers.panel.action.filter": "Filtrer les problèmes",
+	"markers.panel.filter.placeholder": "Filtrer par type ou texte",
+	"markers.panel.filter.errors": "erreurs",
+	"markers.panel.filter.warnings": "avertissements",
+	"markers.panel.filter.infos": "infos",
+	"markers.panel.single.error.label": "1 erreur",
+	"markers.panel.multiple.errors.label": "{0} erreurs",
+	"markers.panel.single.warning.label": "1 avertissement",
+	"markers.panel.multiple.warnings.label": "{0} avertissements",
+	"markers.panel.single.info.label": "1 info",
+	"markers.panel.multiple.infos.label": "{0} infos",
+	"markers.panel.single.unknown.label": "1 inconnu",
+	"markers.panel.multiple.unknowns.label": "{0} inconnus",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} avec {1} problèmes",
+	"errors.warnings.show.label": "Afficher les erreurs et les avertissements"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 675880ca4b7..e355577f0f7 100644
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Afficher le prochain Include Pattern de recherche",
 	"previousSearchIncludePattern": "Afficher le précédent Include Pattern de recherche",
-	"nextSearchExcludePattern": "Afficher le prochain Exclude Pattern de recherche",
-	"previousSearchExcludePattern": "Afficher le précédent Exclude Pattern de recherche",
 	"nextSearchTerm": "Afficher le terme de recherche suivant",
 	"previousSearchTerm": "Afficher le terme de recherche précédent",
 	"showSearchViewlet": "Afficher la zone de recherche",
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
index 4cd20eea1e6..89db9e01119 100644
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Activer/désactiver les détails de la recherche",
-	"searchScope.includes": "fichiers à inclure",
-	"label.includes": "Modèles d'inclusion de recherche",
-	"searchScope.excludes": "fichiers à exclure",
-	"label.excludes": "Modèles d'exclusion de recherche",
 	"replaceAll.confirmation.title": "Tout remplacer",
 	"replaceAll.confirm.button": "&&Remplacer",
 	"replaceAll.occurrence.file.message": "{0} occurrence remplacée dans {1} fichier par '{2}'.",
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 25af594698d..c560e29a2d5 100644
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "N'assigne la tâche à aucun groupe",
 	"JsonSchema.tasks.group": "Définit le groupe d'exécution auquel la tâche appartient. Prend en charge \"build\" pour l'ajouter au groupe de génération et \"test\" pour l'ajouter au groupe de test.",
 	"JsonSchema.tasks.type": "Définit si la tâche est exécutée comme un processus ou comme une commande à l’intérieur d’un shell.",
+	"JsonSchema.command": "Commande à exécuter. Il peut s'agir d'un programme externe ou d'une commande d'interpréteur de commandes.",
+	"JsonSchema.tasks.args": "Arguments passés à la commande quand cette tâche est appelée.",
 	"JsonSchema.tasks.label": "L'étiquette de l’interface utilisateur de la tâche",
 	"JsonSchema.version": "Numéro de version de la configuration.",
 	"JsonSchema.tasks.identifier": "Identificateur défini par l'utilisateur pour référencer la tâche dans launch.json ou une clause dependsOn.",
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index b418f7d92e5..61c4bc5cb90 100644
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,10 @@
 	],
 	"tasksCategory": "Tâches",
 	"ConfigureTaskRunnerAction.label": "Configurer une tâche",
-	"problems": "Problèmes",
+	"totalErrors": "{0} erreurs",
+	"totalWarnings": "{0} avertissements",
+	"totalInfos": "{0} infos",
 	"building": "Génération...",
-	"manyMarkers": "99",
 	"runningTasks": "Afficher les tâches en cours d'exécution",
 	"tasks": "Tâches",
 	"TaskSystem.noHotSwap": "Changer le moteur d’exécution de tâches avec une tâche active en cours d’exécution nécessite de recharger la fenêtre",
@@ -46,8 +47,8 @@
 	"recentlyUsed": "tâches récemment utilisées",
 	"configured": "tâches configurées",
 	"detected": "tâches détectées",
-	"TaskService.ignoredFolder": "Les dossiers d’espace de travail suivants sont ignorés car ils utilisent task version 0.1.0 : ",
 	"TaskService.notAgain": "Ne plus afficher",
+	"TaskService.ignoredFolder": "Les dossiers d’espace de travail suivants sont ignorés car ils utilisent task version 0.1.0 : ",
 	"TaskService.pickRunTask": "Sélectionner la tâche à exécuter",
 	"TaslService.noEntryToRun": "Aucune tâche à exécuter n'a été trouvée. Configurer les tâches...",
 	"TaskService.fetchingBuildTasks": "Récupération des tâches de génération...",
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index cc01c3fa1b2..d4389797bef 100644
--- a/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Erreur : la configuration de la tâche '{0}' a besoin de la propriété '{1}'. La configuration de la tâche sera ignorée.",
 	"ConfigurationParser.notCustom": "Erreur : la tâche n'est pas déclarée comme une tâche personnalisée. La configuration est ignorée.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Erreur : un tâche doit fournir une propriété label. La tâche va être ignorée.\n{0}\n",
-	"taskConfiguration.shellArgs": "Avertissement : la tâche '{0}' est une commande shell et un de ses arguments peut avoir des espaces non échappés. Afin d’assurer un échappement correct des guillemets dans la ligne de commande, veuillez fusionner les arguments dans la commande.",
 	"taskConfiguration.noCommandOrDependsOn": "Erreur : La tâche '{0}' ne spécifie ni une commande, ni une propriété dependsOn. La tâche est ignorée. Sa définition est :\n{1}",
 	"taskConfiguration.noCommand": "Erreur : La tâche '{0}' ne définit aucune commande. La tâche va être ignorée. Sa définition est :\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Task Version 2.0.0 ne supporte pas les tâches spécifiques globales du système d'exploitation. Convertissez-les en une tâche en une commande spécifique du système d'exploitation. Les tâches concernées sont : {0}"
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 023dce563db..8ba26f8e07a 100644
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copier",
+	"split": "Diviser",
 	"paste": "Coller",
 	"selectAll": "Tout Sélectionner",
-	"clear": "Effacer",
-	"split": "Diviser"
+	"clear": "Effacer"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..68cda1a5f01
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Notes de publication : {0}",
+	"unassigned": "non assigné"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 0a4355e2acf..cdcec8f9581 100644
--- a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "Plus tard",
-	"unassigned": "non assigné",
 	"releaseNotes": "Notes de publication",
 	"showReleaseNotes": "Afficher les notes de publication",
 	"read the release notes": "Bienvenue dans {0} v{1} ! Voulez-vous lire les notes de publication ?",
diff --git a/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..de7accdb519
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "éditeur webview"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..0b9766fe701
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "Lire la suite"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..53b77e34248
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} ne peut pas être résolu dans un espace de travail de dossiers multiples. Contrôlez la portée de ces variables en utilisant : et un nom de dossier.",
+	"canNotResolveWorkspaceFolder": "${workspaceFolder} ne peut pas être résolu. Veuillez ouvrir un dossier.",
+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} ne peut pas être résolu dans un espace de travail de dossiers multiples. Contrôlez la portée de ces variables en utilisant : et un nom de dossier.",
+	"canNotResolveFolderBasename": "${workspaceFolderBasename} ne peut pas être résolu. Veuillez ouvrir un dossier.",
+	"canNotResolveLineNumber": "${lineNumber} ne peut pas être résolu, veuillez ouvrir un éditeur.",
+	"canNotResolveSelectedText": "${selectedText} ne peut pas être résolu, veuillez ouvrir un éditeur.",
+	"canNotResolveFile": "${file} ne peut pas être résolu, veuillez ouvrir un éditeur.",
+	"canNotResolveRelativeFile": "${relativeFile} ne peut pas être résolu, veuillez ouvrir un éditeur.",
+	"canNotResolveFileDirname": "${fileDirname} ne peut pas être résolu, veuillez ouvrir un éditeur.",
+	"canNotResolveFileExtname": "${fileExtname} ne peut pas être résolu, veuillez ouvrir un éditeur.",
+	"canNotResolveFileBasename": "${fileBasename} ne peut pas être résolu, veuillez ouvrir un éditeur.",
+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} ne peut pas être résolu, veuillez ouvrir un éditeur."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..ad189dada97
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Oui",
+	"cancelButton": "Annuler"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index d1cd27ab59c..2c081ca984a 100644
--- a/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,6 @@
 	"neverShowAgain": "Ne plus afficher",
 	"netVersionError": "Microsoft .NET Framework 4.5 est obligatoire. Suivez le lien pour l'installer.",
 	"learnMore": "Instructions",
-	"enospcError": "{0} est à court de mémoire pour les fichiers. Veuillez suivre le lien avec les instructions pour résoudre ce problème.",
 	"binFailed": "Échec du déplacement de '{0}' vers la corbeille",
 	"trashFailed": "Échec du déplacement de '{0}' vers la corbeille"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
index 50072355f39..c9a4fd144cd 100644
--- a/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Ressource de fichier non valide ({0})",
 	"fileIsDirectoryError": "Le fichier est un répertoire",
 	"fileNotModifiedError": "Fichier non modifié depuis",
-	"fileTooLargeForHeapError": "La taille du ficher dépasse la limite de mémoire, veuillez essayer d'exécuter  code --max-memory=NEWSIZE",
 	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
 	"fileNotFoundError": "Fichier introuvable ({0})",
 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
diff --git a/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index 5ee1cc9aa2b..85206812111 100644
--- a/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0} : {1}"
+	"progress.title": "{0} : {1}",
+	"cancel": "Annuler"
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..762d665d83d
--- /dev/null
+++ b/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "CSS nyelvi szerver",
+	"folding.start": "Összecsukható tartomány kezdete",
+	"folding.end": "Összecsukható tartomány vége"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css-language-features/package.i18n.json b/i18n/hun/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..aadc8f5c6ff
--- /dev/null
+++ b/i18n/hun/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "CSS nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás CSS-, LESS- és SCSS-fájlokhoz.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
+	"css.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
+	"css.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
+	"css.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
+	"css.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
+	"css.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
+	"css.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
+	"css.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
+	"css.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
+	"css.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
+	"css.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
+	"css.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
+	"css.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
+	"css.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
+	"css.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
+	"css.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
+	"css.trace.server.desc": "A VS Code és a CSS nyelvi szerver közötti kommunikáció naplózása.",
+	"css.validate.title": "Meghatározza a CSS-validáció működését és a problémák súlyosságát.",
+	"css.validate.desc": "Összes validálás engedélyezése vagy letiltása",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
+	"less.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
+	"less.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
+	"less.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
+	"less.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
+	"less.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
+	"less.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
+	"less.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
+	"less.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
+	"less.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
+	"less.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
+	"less.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
+	"less.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
+	"less.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
+	"less.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
+	"less.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
+	"less.validate.title": "Meghatározza a LESS-validáció működését és a problémák súlyosságát.",
+	"less.validate.desc": "Összes validálás engedélyezése vagy letiltása",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
+	"scss.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
+	"scss.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
+	"scss.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
+	"scss.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
+	"scss.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
+	"scss.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
+	"scss.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
+	"scss.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
+	"scss.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
+	"scss.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
+	"scss.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
+	"scss.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
+	"scss.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
+	"scss.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
+	"scss.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
+	"scss.validate.title": "Meghatározza az SCSS-validáció működését és a problémák súlyosságát.",
+	"scss.validate.desc": "Összes validálás engedélyezése vagy letiltása",
+	"less.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"scss.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"css.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"css.colorDecorators.enable.deprecationMessage": "Az `css.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
+	"scss.colorDecorators.enable.deprecationMessage": "Az `scss.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
+	"less.colorDecorators.enable.deprecationMessage": "A `less.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css/package.i18n.json b/i18n/hun/extensions/css/package.i18n.json
index aadc8f5c6ff..804a00791e0 100644
--- a/i18n/hun/extensions/css/package.i18n.json
+++ b/i18n/hun/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás CSS-, LESS- és SCSS-fájlokhoz.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"css.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"css.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"css.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"css.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"css.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"css.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"css.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"css.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"css.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"css.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"css.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"css.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"css.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"css.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"css.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"css.trace.server.desc": "A VS Code és a CSS nyelvi szerver közötti kommunikáció naplózása.",
-	"css.validate.title": "Meghatározza a CSS-validáció működését és a problémák súlyosságát.",
-	"css.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"less.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"less.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"less.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"less.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"less.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"less.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"less.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"less.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"less.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"less.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"less.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"less.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"less.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"less.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"less.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"less.validate.title": "Meghatározza a LESS-validáció működését és a problémák súlyosságát.",
-	"less.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"scss.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"scss.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"scss.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"scss.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"scss.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"scss.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"scss.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"scss.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"scss.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"scss.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"scss.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"scss.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"scss.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"scss.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"scss.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"scss.validate.title": "Meghatározza az SCSS-validáció működését és a problémák súlyosságát.",
-	"scss.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"less.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"scss.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"css.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"css.colorDecorators.enable.deprecationMessage": "Az `css.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"scss.colorDecorators.enable.deprecationMessage": "Az `scss.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"less.colorDecorators.enable.deprecationMessage": "A `less.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
+	"displayName": "CSS nyelvi alapok",
+	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a CSS-, LESS- és SCSS-fájlokban."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/emmet/package.i18n.json b/i18n/hun/extensions/emmet/package.i18n.json
index 8809e7dca73..8d55c3feff5 100644
--- a/i18n/hun/extensions/emmet/package.i18n.json
+++ b/i18n/hun/extensions/emmet/package.i18n.json
@@ -59,5 +59,6 @@
 	"emmetPreferencesCssWebkitProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'webkit' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'webkit' előtagot használni.",
 	"emmetPreferencesCssMozProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'moz' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'moz' előtagot használni.",
 	"emmetPreferencesCssOProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'o' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'o' előtagot használni.",
-	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni."
+	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
+	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/commands.i18n.json b/i18n/hun/extensions/git/out/commands.i18n.json
index b06c2c09402..9c1a3de3b6c 100644
--- a/i18n/hun/extensions/git/out/commands.i18n.json
+++ b/i18n/hun/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "A címkékkel együtt történő pusholás sikeresen befejeződött.",
 	"pick remote": "Válassza ki a távoli szervert, ahová publikálni szeretné a(z) '{0}' ágat:",
-	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}'.",
+	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}/{1}'.",
 	"never again": "Rendben, ne jelenjen meg újra",
 	"no remotes to publish": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová publikálni lehetne.",
 	"no changes stash": "Nincs elrakandó módosítás.",
diff --git a/i18n/hun/extensions/git/package.i18n.json b/i18n/hun/extensions/git/package.i18n.json
index 71a958c4b2c..d2831b61da5 100644
--- a/i18n/hun/extensions/git/package.i18n.json
+++ b/i18n/hun/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Meghatározza, hogy megjelenjen-e a sorok között egy 'Fájl megnyitása' művelet a git változások nézetén.",
 	"config.inputValidation": "Meghatározza, hogy mikor jelenjen meg a beadási üzenet validálása.",
 	"config.detectSubmodules": "Meghatározza, hogy automatikusan fel legyenek-e derítve a git almodulok.",
+	"config.detectSubmodulesLimit": "Korlátozza a felderített git almodulok számát.",
 	"colors.modified": "A módosított erőforrások színe.",
 	"colors.deleted": "A törölt erőforrások színe.",
 	"colors.untracked": "A nem követett erőforrások színe.",
diff --git a/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..8b705a97409
--- /dev/null
+++ b/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "HTML nyelvi szerver",
+	"folding.start": "Összecsukható tartomány kezdete",
+	"folding.end": "Összecsukható tartomány vége"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html-language-features/package.i18n.json b/i18n/hun/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..c4e070a679d
--- /dev/null
+++ b/i18n/hun/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás HTML-, Razor- és Handlebar-fájlokhoz.",
+	"html.format.enable.desc": "Alapértelmezett HTML-formázó engedélyezése vagy letiltása.",
+	"html.format.wrapLineLength.desc": "Maximális karakterszám soronként (0 = letiltás)",
+	"html.format.unformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a https://www.w3.org/TR/html5/dom.html#phrasing-content oldalon listázott elemek lesznek használva.",
+	"html.format.contentUnformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a 'pre' tag lesz használva.",
+	"html.format.indentInnerHtml.desc": "<head>- és <body>-szakaszok indentálása.",
+	"html.format.preserveNewLines.desc": "Az elemek előtt lévő sortörések meg legyenek-e hagyva. Csak elemek előtt működik, elemek belsejében vagy szövegben nem.",
+	"html.format.maxPreserveNewLines.desc": "Az egymás után megőrzött sortörések maximális száma. Ha nem szeretné korlátozni, használja a 'null' értéket!",
+	"html.format.indentHandlebars.desc": "{{#foo}} és {{/foo}} formázása és indentálása.",
+	"html.format.endWithNewline.desc": "Lezárás új sorral.",
+	"html.format.extraLiners.desc": "Azon elemek veszővel elválasztott listája, amelyek előtt lennie kell egy extra új sornak. 'null' érték esetén a \"head,body,/html\" érték van használva.",
+	"html.format.wrapAttributes.desc": "Attribútumok tördelése.",
+	"html.format.wrapAttributes.auto": "Az attribútumok csak akkor vannak tördelve, ha a sorhossz túl lett lépve.",
+	"html.format.wrapAttributes.force": "Minden egyes attribútum tördelve van, kivéve az elsőt.",
+	"html.format.wrapAttributes.forcealign": "Minden egyes attribútum tördelve van, kivéve az elsőt, és igazítva vannak.",
+	"html.format.wrapAttributes.forcemultiline": "Minden egyes attribútum tördelve van.",
+	"html.suggest.angular1.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Angular V1 elemeket és tulajdonságokat.",
+	"html.suggest.ionic.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Ionic elemeket, tulajdonságokat és értékeket.",
+	"html.suggest.html5.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e HTML5-ös elemeket, tulajdonságokat és értékeket.",
+	"html.trace.server.desc": "A VS Code és a HTML nyelvi szerver közötti kommunikáció naplózása.",
+	"html.validate.scripts": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott parancsafájlokat.",
+	"html.validate.styles": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott stílusfájlokat.",
+	"html.autoClosingTags": "HTML-elemek automatikus lezárásának engedélyezése vagy tetiltása."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html/package.i18n.json b/i18n/hun/extensions/html/package.i18n.json
index 8718becb266..bb0ee17f709 100644
--- a/i18n/hun/extensions/html/package.i18n.json
+++ b/i18n/hun/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás HTML-, Razor- és Handlebar-fájlokhoz.",
-	"html.format.enable.desc": "Alapértelmezett HTML-formázó engedélyezése vagy letiltása.",
-	"html.format.wrapLineLength.desc": "Maximális karakterszám soronként (0 = letiltás)",
-	"html.format.unformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a https://www.w3.org/TR/html5/dom.html#phrasing-content oldalon listázott elemek lesznek használva.",
-	"html.format.contentUnformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a 'pre' tag lesz használva.",
-	"html.format.indentInnerHtml.desc": "<head>- és <body>-szakaszok indentálása.",
-	"html.format.preserveNewLines.desc": "Az elemek előtt lévő sortörések meg legyenek-e hagyva. Csak elemek előtt működik, elemek belsejében vagy szövegben nem.",
-	"html.format.maxPreserveNewLines.desc": "Az egymás után megőrzött sortörések maximális száma. Ha nem szeretné korlátozni, használja a 'null' értéket!",
-	"html.format.indentHandlebars.desc": "{{#foo}} és {{/foo}} formázása és indentálása.",
-	"html.format.endWithNewline.desc": "Lezárás új sorral.",
-	"html.format.extraLiners.desc": "Azon elemek veszővel elválasztott listája, amelyek előtt lennie kell egy extra új sornak. 'null' érték esetén a \"head,body,/html\" érték van használva.",
-	"html.format.wrapAttributes.desc": "Attribútumok tördelése.",
-	"html.format.wrapAttributes.auto": "Az attribútumok csak akkor vannak tördelve, ha a sorhossz túl lett lépve.",
-	"html.format.wrapAttributes.force": "Minden egyes attribútum tördelve van, kivéve az elsőt.",
-	"html.format.wrapAttributes.forcealign": "Minden egyes attribútum tördelve van, kivéve az elsőt, és igazítva vannak.",
-	"html.format.wrapAttributes.forcemultiline": "Minden egyes attribútum tördelve van.",
-	"html.suggest.angular1.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Angular V1 elemeket és tulajdonságokat.",
-	"html.suggest.ionic.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Ionic elemeket, tulajdonságokat és értékeket.",
-	"html.suggest.html5.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e HTML5-ös elemeket, tulajdonságokat és értékeket.",
-	"html.trace.server.desc": "A VS Code és a HTML nyelvi szerver közötti kommunikáció naplózása.",
-	"html.validate.scripts": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott parancsafájlokat.",
-	"html.validate.styles": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott stílusfájlokat.",
-	"html.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása.",
-	"html.autoClosingTags": "HTML-elemek automatikus lezárásának engedélyezése vagy tetiltása."
+	"displayName": "HTML nyelvi alapok",
+	"description": "Szintaktikai kiemelést, összetartozó zárójelek kezelését és kódtöredékeket szolgáltat a HTML-fájlokhoz."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..7651ab518e4
--- /dev/null
+++ b/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "JSON nyelvi szerver"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json-language-features/package.i18n.json b/i18n/hun/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..ddfd0e82d10
--- /dev/null
+++ b/i18n/hun/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "JSON nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás JSON-fájlokhoz.",
+	"json.schemas.desc": "Sémák hozzárendelése JSON-fájlokhoz a jelenlegi projektben",
+	"json.schemas.url.desc": "Egy séma URL-címe vagy egy séma relatív elérési útja az aktuális könyvtárban",
+	"json.schemas.fileMatch.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva.",
+	"json.schemas.fileMatch.item.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva. Tartalmazhat '*'-ot.",
+	"json.schemas.schema.desc": "Az adott URL-cím sémadefiníciója. A sémát csak a séma URL-címéhez való fölösleges lekérdezések megakadályozása érdekében kell megadni.",
+	"json.format.enable.desc": "Alapértelmezett JSON-formázó engedélyezése vagy letiltása (újraindítást igényel)",
+	"json.tracing.desc": "A VS Code és a JSON nyelvi szerver közötti kommunikáció naplózása.",
+	"json.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"json.colorDecorators.enable.deprecationMessage": "A `json.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json/package.i18n.json b/i18n/hun/extensions/json/package.i18n.json
index a4504577c67..55ffac6d3dd 100644
--- a/i18n/hun/extensions/json/package.i18n.json
+++ b/i18n/hun/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás JSON-fájlokhoz.",
-	"json.schemas.desc": "Sémák hozzárendelése JSON-fájlokhoz a jelenlegi projektben",
-	"json.schemas.url.desc": "Egy séma URL-címe vagy egy séma relatív elérési útja az aktuális könyvtárban",
-	"json.schemas.fileMatch.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva.",
-	"json.schemas.fileMatch.item.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva. Tartalmazhat '*'-ot.",
-	"json.schemas.schema.desc": "Az adott URL-cím sémadefiníciója. A sémát csak a séma URL-címéhez való fölösleges lekérdezések megakadályozása érdekében kell megadni.",
-	"json.format.enable.desc": "Alapértelmezett JSON-formázó engedélyezése vagy letiltása (újraindítást igényel)",
-	"json.tracing.desc": "A VS Code és a JSON nyelvi szerver közötti kommunikáció naplózása.",
-	"json.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"json.colorDecorators.enable.deprecationMessage": "A `json.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"json.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása."
+	"displayName": "JSON nyelvi alapok",
+	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a JSON-fájlokban."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..9eab0fec461
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "A 'markdown.styles' nem tölthető be: {0}"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..a7a0c887484
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[Előnézet] {0}",
+	"previewTitle": "{0} előnézete"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..0a920063d63
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "A tartalom egy része le van tiltva az aktuális dokumentumban",
+	"preview.securityMessage.title": "Potencionálisan veszélyes vagy nem biztonságos tartalom lett letiltva a markdown-előnézetben. Módosítsa a markdown-előnézet biztonsági beállításait a nem biztonságos tartalmak vagy parancsfájlok engedélyezéséhez!",
+	"preview.securityMessage.label": "Biztonsági figyelmeztetés: tartalom le van tiltva"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/security.i18n.json b/i18n/hun/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..def0928c3a2
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "Szigorú",
+	"strict.description": "Csak biztonságos tartalmak betöltése",
+	"insecureContent.title": "Nem biztonságos tartalom engedélyezése",
+	"insecureContent.description": "Tartalom betöltésének engedélyezése HTTP-n keresztül.",
+	"disable.title": "Letiltás",
+	"disable.description": "Minden tartalom és parancsfájl futtatásának engedélyezése. Nem ajánlott.",
+	"moreInfo.title": "További információ",
+	"enableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések engedélyezése ezen a munkaterületen",
+	"disableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések letiltása ezen a munkaterületen",
+	"toggleSecurityWarning.description": "Nem befolyásolja a tartalom biztonsági szintjét",
+	"preview.showPreviewSecuritySelector.title": "Válassza ki a munkaterület Markdown-előnézeteinek biztonsági beállítását!"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/package.i18n.json b/i18n/hun/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..5e8a8541227
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Markdown nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás Markdown-fájlokhoz.",
+	"markdown.preview.breaks.desc": "Meghatározza, hogy a sortörések hogyan vannak megjelenítve a markdown-előnézetben. Ha az értéke 'true', akkor minden egyes újsor esetén <br> jön létre.",
+	"markdown.preview.linkify": "URL-szerű szövegek hivatkozássá alakításának engedélyezése vagy letiltása a markdown-előnézetben.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Kattintson duplán a markdown-előnézetre a szerkesztőre való átváltáshoz.",
+	"markdown.preview.fontFamily.desc": "Meghatározza a markdown-előnézeten használt betűkészletet.",
+	"markdown.preview.fontSize.desc": "Meghatározza a markdown-előnézet betűméretét, pixelekben.",
+	"markdown.preview.lineHeight.desc": "Meghatározza a markdown-előnézeten használt sormagasságot. Az érték relatív a betűmérethez képest.",
+	"markdown.preview.markEditorSelection.desc": "Az aktuális kijelölés megjelölése a markdown-előnézeten",
+	"markdown.preview.scrollEditorWithPreview.desc": "Amikor a markdown-előnézetet görgetik, a szerkesztőnézet is aktualizálódik",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Amikor a markdown-szerkesztőnézetet görgetik, az előnézet is aktualizálódik.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Elavult] A markdown-előnézetet úgy görgeti, hogy látni lehessen az aktuálisan kijelölt sort.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ezt a beállítást leváltotta a 'markdown.preview.scrollPreviewWithEditor' beállítás, és már nincs hatása.",
+	"markdown.preview.title": "Előnézet megnyitása",
+	"markdown.previewFrontMatter.dec": "Meghatározza, hogy a YAML konfiguráció (front matter) hogyan legyen megjelenítve a markdown-előnézetben. A 'hide' elrejti a konfigurációt, minden más esetben a front matter markdown-tartalomként van kezelve.",
+	"markdown.previewSide.title": "Előnézet megnyitása oldalt",
+	"markdown.showLockedPreviewToSide.title": "Rögzített előnézet megnyitása oldalt",
+	"markdown.showSource.title": "Forrás megjelenítése",
+	"markdown.styles.dec": "CSS-stíluslapok URL-címeinek vagy helyi elérési útjainak listája, amelyek a markdown-előnézeten használva vannak. A relatív elérési utak az intézőben megnyitott mappához képest vannak relatívan értelmezve. Ha nincs mappa megnyitva, akkor a markdown-fájl elréséi útjához képest. Minden '\\' karaktert '\\\\' formában kell megadni.",
+	"markdown.showPreviewSecuritySelector.title": "Az előnézet biztonsági beállításainak módosítása",
+	"markdown.trace.desc": "Hibakeresési napló engedélyezése a markdown kiterjesztésben.",
+	"markdown.preview.refresh.title": "Előnézet frissítése",
+	"markdown.preview.toggleLock.title": "Előnézet rögzítésének be- és kikapcsolása"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..d4851192c11
--- /dev/null
+++ b/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "Engedélyezi a(z) {0} (munkaterületi beállításként megadott) végrehajtását a PHP-fájlok linteléséhez?",
+	"php.yes": "Engedélyezés",
+	"php.no": "Tiltás",
+	"wrongExecutable": "A validáció nem sikerült, mivel a(z) {0} nem egy érvényes php végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
+	"noExecutable": "A validáció nem sikerült, mivel nincs beállítva PHP végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
+	"unknownReason": "Nem sikerült futtatni a PHP-t a következő elérési út használatával: {0}. Az ok ismeretlen."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php-language-features/package.i18n.json b/i18n/hun/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..1d6ca7197bd
--- /dev/null
+++ b/i18n/hun/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Meghatározza, hogy a beépített PHP nyelvi támogatás ajánl-e PHP globálisokat és változókat.",
+	"configuration.validate.enable": "Beépített PHP-validáció engedélyezése vagy letiltása",
+	"configuration.validate.executablePath": "A PHP végrehajtható fájljának elérési útja.",
+	"configuration.validate.run": "A linter mentéskor vagy gépeléskor fut-e.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP-validációs végrehajtható fájl letiltása (munkaterületi beállításként megadva)",
+	"displayName": "PHP nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás PHP-fájlokhoz."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php/package.i18n.json b/i18n/hun/extensions/php/package.i18n.json
index 2fd2af0d0e8..41a3d3f94af 100644
--- a/i18n/hun/extensions/php/package.i18n.json
+++ b/i18n/hun/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Meghatározza, hogy a beépített PHP nyelvi támogatás ajánl-e PHP globálisokat és változókat.",
-	"configuration.validate.enable": "Beépített PHP-validáció engedélyezése vagy letiltása",
-	"configuration.validate.executablePath": "A PHP végrehajtható fájljának elérési útja.",
-	"configuration.validate.run": "A linter mentéskor vagy gépeléskor fut-e.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP-validációs végrehajtható fájl letiltása (munkaterületi beállításként megadva)",
 	"displayName": "PHP nyelvi funkciók",
-	"description": "IntelliSense-t, lintelést és alapvető nyelvi funkciókat szolgáltat a PHP-fájlokban."
+	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a PHP-fájlokban."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index ed46a94304d..92689292f4f 100644
--- a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "Nincs találat",
 	"settingsSearchIssue": "Hiba a beállítások keresőjében",
 	"bugReporter": "hibát",
-	"performanceIssue": "teljesítményproblémát",
 	"featureRequest": "funkcióigényt",
+	"performanceIssue": "teljesítményproblémát",
 	"stepsToReproduce": "A probléma előidézésének lépései",
 	"bugDescription": "Ossza meg a probléma megbízható előidézéséhez szükséges részleteket! Írja le a valós és az elvárt működést! A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
 	"performanceIssueDesciption": "Mikor fordult elő ez a teljesítménybeli probléma? Például előfordul indulásnál vagy végre kell hajtani bizonyos műveleteket? A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
diff --git a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
index c76fc2901ea..a81eff02751 100644
--- a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,9 @@
 	"warningBorder": "A figyelmeztetéseket jelző hullámvonal keretszíne a szerkesztőablakban.",
 	"infoForeground": "Az információkat jelző hullámvonal előtérszíne a szerkesztőablakban.",
 	"infoBorder": "Az információkat jelző hullámvonal keretszíne a szerkesztőablakban. ",
-	"overviewRulerRangeHighlight": "A kiemelt tartományokat jelölő jelzések színe az áttekintősávon.",
+	"hintForeground": "Az utalásokat jelző hullámvonal előtérszíne a szerkesztőablakban.",
+	"hintBorder": "Az utalásokat jelző hullámvonal keretszíne a szerkesztőablakban.",
+	"overviewRulerRangeHighlight": "A kiemelt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"overviewRuleError": "A hibákat jelölő jelzések színe az áttekintősávon.",
 	"overviewRuleWarning": "A figyelmeztetéseket jelölő jelzések színe az áttekintősávon.",
 	"overviewRuleInfo": "Az információkat jelölő jelzések színe az áttekintősávon."
diff --git a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index f1e97f6010a..0665568c203 100644
--- a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Következő probléma (hiba, figyelmeztetés, információ)",
-	"markerAction.previous.label": "Előző probléma (hiba, figyelmeztetés, információ)",
-	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
-	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
-	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
-	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
+	"markerAction.previous.label": "Előző probléma (hiba, figyelmeztetés, információ)"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..60534d6d43e
--- /dev/null
+++ b/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
+	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
+	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
+	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..57dd858270a
--- /dev/null
+++ b/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"Sunday": "vasárnap",
+	"Monday": "hétfő",
+	"Tuesday": "kedd",
+	"Wednesday": "szerda",
+	"Thursday": "csütörtök",
+	"Friday": "péntek",
+	"Saturday": "szombat",
+	"SundayShort": "vas",
+	"MondayShort": "hét",
+	"TuesdayShort": "kedd",
+	"WednesdayShort": "sze",
+	"ThursdayShort": "csüt",
+	"FridayShort": "pén",
+	"SaturdayShort": "szo",
+	"January": "január",
+	"February": "február",
+	"March": "március",
+	"April": "április",
+	"May": "május",
+	"June": "június",
+	"July": "július",
+	"August": "augusztus",
+	"September": "szeptember",
+	"October": "október",
+	"November": "november",
+	"December": "december",
+	"JanuaryShort": "jan",
+	"FebruaryShort": "feb",
+	"MarchShort": "márc",
+	"AprilShort": "ápr",
+	"MayShort": "máj",
+	"JuneShort": "jún",
+	"JulyShort": "júl",
+	"AugustShort": "aug",
+	"SeptemberShort": "szept",
+	"OctoberShort": "okt",
+	"NovemberShort": "nov",
+	"DecemberShort": "dec"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index a60448390b0..e66f795b53c 100644
--- a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"wordHighlightBorder": "Szimbólumok háttérszíne olvasási hozzáférés, például változó olvasása esetén.",
 	"wordHighlightStrongBorder": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén.",
-	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon.",
-	"overviewRulerWordHighlightStrongForeground": "A kiemelt, írási hozzáférésű szimbólumokat jelölő jelzések színe az áttekintősávon.",
+	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"overviewRulerWordHighlightStrongForeground": "Az írási hozzáféréssel rendelkező szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
 	"wordHighlight.previous.label": "Ugrás az előző kiemelt szimbólumhoz"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..43e1fb70709
--- /dev/null
+++ b/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 további fájl nincs megjelenítve",
+	"moreFiles": "...{0} további fájl nincs megjelenítve"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..d1d33322cd8
--- /dev/null
+++ b/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "Mégse"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 0cfe9dca9e2..c2eaf97d09f 100644
--- a/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Hiba a függőségek telepítése közben. {0}",
 	"MarketPlaceDisabled": "A piactér nincs engedélyezve",
 	"removeError": "Hiba történt a kiegészítő eltávolítása közben: {0}. Lépjen ki és indítsa el a VS Code-ot mielőtt újrapróbálná!",
-	"Not Market place extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
+	"Not a Marketplace extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
 	"notFoundCompatible": "A(z) '{0}' nem telepíthető: nincs a VS Code '{1}' verziójával kompatibilis változat.",
 	"malicious extension": "A kiegészítő nem telepíthető, mert jelentették, hogy problémás.",
 	"notFoundCompatibleDependency": "A telepítés nem sikerült, mert a(z) '{0}' kiegészítő függőség VS Code '{1}' verziójával kompatibilis változata nem található. ",
 	"quitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
 	"exitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
 	"uninstallDependeciesConfirmation": "Csak a(z) '{0}' kiegészítőt szeretné eltávolítani vagy annak függőségeit is?",
-	"uninstallOnly": "Csak ezt",
-	"uninstallAll": "Mindent",
+	"uninstallOnly": "Csak a kiegészítőt",
+	"uninstallAll": "Az összes eltávolítása",
 	"uninstallConfirmation": "Biztosan szeretné eltávolítani a(z) '{0}' kiegészítőt?",
 	"ok": "OK",
 	"singleDependentError": "Nem sikerült eltávolítani a(z) '{0}' kiegészítőt: a(z) '{1}' kiegészítő függ tőle.",
diff --git a/i18n/hun/src/vs/platform/list/browser/listService.i18n.json b/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
index c91ae24bd28..23a85678ca5 100644
--- a/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Több elem kijelölése esetén újabb elem hozzáadásához használt módosítóbillentyű a fanézetekben és listákban (például a fájlkezelőben, a megnyitott szerkesztőablakok listájában és a verziókezelő rendszer nézeten). A `ctrlCmd` Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti. A 'Megnyitás oldalt\" egérgesztusok – ha támogatva vannak – automatikusan úgy lesznek beállítva, hogy ne ütközzenek a több elem kijelöléséhez tartozó módosító billentyűvel.",
 	"openMode.singleClick": "Elemek megnyitása egyetlen kattintásra.",
 	"openMode.doubleClick": "Elemek megnyitása dupla kattintásra.",
-	"openModeModifier": "Meghatározza, hogyan nyíljanak meg az elemek a fanézetekben és listákban egér használata esetén (ha támogatott). `singleClick` esetén egyetlen kattintásra megnyílnak az elemek, míg `doubleClick` esetén dupla kattintás szükséges. Fanézeteknél meghatározza, hogy a szülőelemek egyetlen vagy dupla kattintásra nyílnak ki. Megjegyzés: néhány fanézet és lista figyelmen kívül hagyja ezt a beállítást ott, ahol ez nem alkalmazható. "
+	"openModeModifier": "Meghatározza, hogyan nyíljanak meg az elemek a fanézetekben és listákban egér használata esetén (ha támogatott). `singleClick` esetén egyetlen kattintásra megnyílnak az elemek, míg `doubleClick` esetén dupla kattintás szükséges. Fanézeteknél meghatározza, hogy a szülőelemek egyetlen vagy dupla kattintásra nyílnak ki. Megjegyzés: néhány fanézet és lista figyelmen kívül hagyja ezt a beállítást ott, ahol ez nem alkalmazható. ",
+	"horizontalScrolling setting": "Meghatározza, hogy a fák támogatják-e a vízszintes görgetést a munkaterületen."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/markers/common/markers.i18n.json b/i18n/hun/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..ba6e96532e0
--- /dev/null
+++ b/i18n/hun/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Hiba",
+	"sev.warning": "Figyelmeztetés",
+	"sev.info": "Információ"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
index a77c528ab13..a470002b64a 100644
--- a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "A helyi tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
 	"overviewRulerIncomingContentForeground": "A beérkező tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
 	"overviewRulerCommonContentForeground": "A közös ős tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén. ",
-	"overviewRulerFindMatchForeground": "A keresési találatokat jelölő jelzések színe az áttekintősávon.",
-	"overviewRulerSelectionHighlightForeground": "A kiemelt kijelöléseket jelölő jelzések színe az áttekintősávon."
+	"overviewRulerFindMatchForeground": "A keresési találatokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"overviewRulerSelectionHighlightForeground": "A kijelölt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 59c82a1f395..1a6a8a26fbe 100644
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Mentéskor végzett formázás megszakítva {0}ms után",
+	"timeout.onWillSave": "OnWillSaveTextDocument-esemény megszakítva 1750ms után",
 	"saveParticipants": "Mentési események futtatása..."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..c073dbed804
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"extensionSource": "{0} (kiegészítő)"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 39a626587ee..2de10454592 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Váltás a következő csoportra",
 	"openToSide": "Megnyitás oldalt",
 	"closeEditor": "Szerkesztőablak bezárása",
+	"closeOneEditor": "Bezárás",
 	"revertAndCloseActiveEditor": "Visszaállítás és szerkesztőablak bezárása",
 	"closeEditorsToTheLeft": "Balra lévő szerkesztőablakok bezárása",
 	"closeAllEditors": "Összes szerkesztőablak bezárása",
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 74c48b61345..d823f6837d9 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Bezárás",
 	"araLabelEditorActions": "Szerkesztőablak-műveletek"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index b62321b07d6..a22a300f861 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Nincs új értesítés",
 	"notifications": "Értesítések",
 	"notificationsToolbar": "Értesítésiközpont-műveletek",
 	"notificationsList": "Értesítések listája"
diff --git a/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 1360b8af1f1..6bbb36e90ae 100644
--- a/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Ablak",
 	"window.openFilesInNewWindow.on": "A fájlok új ablakban nyílnak meg",
 	"window.openFilesInNewWindow.off": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban",
-	"window.openFilesInNewWindow.default": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva (csak macOS-en)",
-	"openFilesInNewWindow": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva (csak macOS-en)\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
+	"window.openFilesInNewWindow.defaultMac": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva",
+	"window.openFilesInNewWindow.default": "A fájlok új ablakban nyílnak meg, kivéve akkor, ha az alkalmazáson belül lettek kiválasztva (pl. a Fájl menüből)",
+	"openFilesInNewWindowMac": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
+	"openFilesInNewWindow": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok új ablakban nyílnak meg, kivéve akkor, ha az alkalmazáson belül lettek kiválasztva (pl. a Fájl menüből).\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
 	"window.openFoldersInNewWindow.on": "A mappák új ablakban nyílnak meg",
 	"window.openFoldersInNewWindow.off": "A mappák lecserélik a legutoljára aktív ablakot",
 	"window.openFoldersInNewWindow.default": "A mappák új ablakban nyílnak meg, kivéve akkor, ha a mappát az alkalmazáson belül lett kiválasztva (pl. a Fájl menüből)",
 	"openFoldersInNewWindow": "Meghatározza, hogy a mappák új ablakban legyenek-e megnyitva.\n- alapértelmezett: A mappák új ablakban nyílnak meg, kivéve akkor, ha a mappát az alkalmazáson belül lett kiválasztva (pl. a Fájl menüből)\n- on: A mappák új ablakban nyílnak meg\n- off: A mappák lecserélik a legutoljára aktív ablakot\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
+	"window.openWithoutArgumentsInNewWindow.on": "Új, üres ablak megnyitása",
+	"window.openWithoutArgumentsInNewWindow.off": "Váltás a legutóbb aktív, futó példányra",
+	"openWithoutArgumentsInNewWindow": "Meghatározza, hogy egy új, üres ablak nyíljon-e meg, ha egy új példány indul paraméterek nélkül, vagy váltson a legutóbb aktív, futó példányra.\n- on: Új, üres ablak megnyitása.\n- off: váltás a legutóbb aktív, futó példányra\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
 	"window.reopenFolders.all": "Összes ablak újranyitása.",
 	"window.reopenFolders.folders": "Összes mappa újranyitása. Az üres munkaterületek nem lesznek helyreállítva.",
 	"window.reopenFolders.one": "A legutóbbi aktív ablak újranyitása.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "Meghatározza, hogy újraindítás után hogyan vannak ismét megnyitva az ablakok. A 'none' választása esetén mindig üres munkaterület indul, 'one' esetén a legutóbb használt ablak nyílik meg újra, a 'folders' megnyitja az összes megnyitott mappát, míg az 'all' újranyitja az összes ablakot az előző munkamenetből.",
 	"restoreFullscreen": "Meghatározza, hogy az ablak teljesképernyős módban nyíljon-e meg, ha kilépéskor teljes képernyős módban volt.",
 	"zoomLevel": "Meghatározza az ablak nagyítási szintjét. Az eredei méret 0, és minden egyes plusz (pl. 1) vagy mínusz (pl. -1) 20%-kal nagyobb vagy kisebb nagyítási szintet jelent. Tizedestört megadása esetén a nagyítási szint finomabban állítható.",
-	"title": "Meghatározza az ablak címét az aktív szerkesztőablak alapján. A változók a környezet alapján vannak behelyettesítve:\n${activeEditorShort}: a fájl neve (pl. myFile.txt)\n${activeEditorMedium}:  a fájl relatív elérési útja a munkaterület mappájához képest (pl. myFolder/myFile.txt)\n${activeEditorLong}: a fájl teljes elérési útja (pl. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: azon munkaterületi mappa a neve, amelyben a fájl található (pl. myFolder)\n${folderPath}: azon munkaterületi mappa elérési útja, amelyben a fájl található (pl. /Users/Development/myFolder)\n${rootName}: a munkaterület neve (pl. myFolder vagy myWorkspace)\n${rootPath}: a munkaterület elérési útja (pl. /Users/Development/myWorkspace)\n${appName}: pl. VS Code\n${dirty}: módosításjelző, ami jelzi, ha az aktív szerkesztőablak tartalma módosítva lett\n${separator}: feltételes elválasztó (\" - \"), ami akkor jelenik meg, ha olyan változókkal van körülvéve, amelyeknek van értéke",
+	"title": "Meghatározza az ablak címét az aktív szerkesztőablak alapján. A változók a környezet alapján vannak behelyettesítve:\n${activeEditorShort}: az aktív fájl neve (pl. myFile.txt)\n${activeEditorMedium}:  a fájl relatív elérési útja a munkaterület mappájához képest (pl. myFolder/myFile.txt)\n${activeEditorLong}: a fájl teljes elérési útja (pl. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: azon munkaterületi mappa a neve, amelyben a fájl található (pl. myFolder)\n${folderPath}: azon munkaterületi mappa elérési útja, amelyben a fájl található (pl. /Users/Development/myFolder)\n${rootName}: a munkaterület neve (pl. myFolder vagy myWorkspace)\n${rootPath}: a munkaterület elérési útja (pl. /Users/Development/myWorkspace)\n${appName}: pl. VS Code\n${dirty}: módosításjelző, ami jelzi, ha az aktív szerkesztőablak tartalma módosítva lett\n${separator}: feltételes elválasztó (\" - \"), ami akkor jelenik meg, ha statikus szöveggek vagy olyan változókkal van körülvéve, amelyeknek van értéke\n",
 	"window.newWindowDimensions.default": "Az új ablakok a képernyő közepén nyílnak meg.",
 	"window.newWindowDimensions.inherit": "Az új ablakok ugyanolyan méretben és ugyanazon a helyen jelennek meg, mint a legutoljára aktív ablak.",
 	"window.newWindowDimensions.maximized": "Az új ablakok teljes méretben nyílnak meg.",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "Ha engedélyezve van, az alkalmazás automatikusan átvált a nagy kontrasztos témára, ha a WIndows a nagy kontrasztos témát használ, és a sötét témára, ha a Windows átvált a nagy kontrasztos témáról.",
 	"titleBarStyle": "Módosítja az ablak címsorának megjelenését. A változtatás teljes újraindítást igényel.",
 	"window.nativeTabs": "Engedélyezi a macOS Sierra ablakfüleket. Megjegyzés: a változtatás teljes újraindítást igényel, és a natív fülek letiltják az egyedi címsorstílust, ha azok be vannak konfigurálva.",
+	"window.smoothScrollingWorkaround": "Akkor engedélyezze ezt a kerülőmegoldást, ha a görgetés nem egyenletes egy kis méretre rakott VS Code-ablak helyreállítása után. Ez egy kerülőmegoldás arra a problémára (https://github.com/Microsoft/vscode/issues/13612), amely a trackpadokkal rendelkező eszközöket érinti, például a Microsoft Surface készülékeit. A kerülőmegoldás engedélyezése a felület elrendezésének ugrálásával járhat az ablak kis méretből való helyreállítása után, de egyébként nem okoz más problémát.",
 	"zenModeConfigurationTitle": "Zen-mód",
 	"zenMode.fullScreen": "Meghatározza, hogy zen-módban a munakterület teljes képernyős módba vált-e.",
 	"zenMode.centerLayout": "Meghatározza, hogy zen-módban középre igazított elrendezés van-e.",
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 37fc52be33c..9682e0aa906 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "Nem megerősített töréspont",
 	"functionBreakpointUnsupported": "Ez a hibakereső nem támogatja a függvénytöréspontokat",
 	"breakpointDirtydHover": "Nem megerősített töréspont. A fájl módosult, indítsa újra a hibakeresési munkamenetet.",
+	"logBreakpointUnsupported": "Ez a hibakereső nem támogatja a naplózási pontokat",
 	"conditionalBreakpointUnsupported": "Ez a hibakereső nem támogatja a feltételes töréspontokat",
 	"hitBreakpointUnsupported": "Ez a hibakereső nem támogatja az érintési feltételes töréspontokat"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 21b6e93773f..621a6e08120 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Keret újraindítása",
 	"removeBreakpoint": "Töréspont eltávolítása",
 	"removeAllBreakpoints": "Összes töréspont eltávolítása",
-	"enableBreakpoint": "Töréspont engedélyezése",
-	"disableBreakpoint": "Töréspont letiltása",
 	"enableAllBreakpoints": "Összes töréspont engedélyezése",
 	"disableAllBreakpoints": "Összes töréspont letiltása",
 	"activateBreakpoints": "Töréspontok aktiválása",
 	"deactivateBreakpoints": "Töréspontok deaktiválása",
 	"reapplyAllBreakpoints": "Töréspontok felvétele ismét",
 	"addFunctionBreakpoint": "Függvénytöréspont hozzáadása",
-	"addConditionalBreakpoint": "Feltételes töréspont hozzáadása...",
-	"editConditionalBreakpoint": "Töréspont szerkesztése...",
 	"setValue": "Érték beállítása",
 	"addWatchExpression": "Kifejezés hozzáadása",
 	"editWatchExpression": "Kifejezés szerkesztése",
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 37ae84d50a7..a6f8cf46fb3 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Hibakeresés: Töréspont be- és kikapcsolása",
 	"conditionalBreakpointEditorAction": "Hibakeresés: Feltételes töréspont...",
+	"logPointEditorAction": "Hibakeresés: Naplózási pont hozzáadása...",
 	"runToCursor": "Futtatás a kurzorig",
 	"debugEvaluate": "Hibakeresés: Kiértékelés",
 	"debugAddToWatch": "Hibakeresés: Hozzáadás a figyelőlistához",
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..07aae479f50
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetLogMessagePlaceholder": "A töréspont érintése esetén naplózandó üzenet. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
+	"breakpointWidgetHitCountPlaceholder": "Futás megállítása, ha adott alkalommal érintve lett. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
+	"breakpointWidgetExpressionPlaceholder": "Futás megállítása, ha a kifejezés értéke igazra értékelődik ki. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
+	"breakpointWidgetLogMessageAriaLabel": "A program ezt üzenetet naplózza a töréspont minden egyes érintése során. A megerősítéshez nyomja meg az Enter billentyűt, a megszakításhoz az Escape-et!",
+	"breakpointWidgetHitCountAriaLabel": "A program akkor fog megállni itt, ha adott alkalommal érintette ezt a pontot. A megerősítéshez nyomja meg az Enter billentyűt, a megszakításhoz az Escape-et!",
+	"breakpointWidgetAriaLabel": "A program csak akkor áll meg itt, ha a feltétel igaz. A megerősítéshez nyomja meg az Enter billentyűt, a megszakításhoz az Escape-et!",
+	"expression": "Kifejezés",
+	"hitCount": "Érintések száma",
+	"logMessage": "Üzenet naplózása"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 7b054714fb8..ee50c51ea05 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Töréspont szerkesztése...",
+	"disableBreakpoint": "Töréspont letiltása",
+	"enableBreakpoint": "Töréspont engedélyezése",
 	"removeBreakpoints": "Töréspontok eltávolítása",
 	"removeBreakpointOnColumn": "{0}. oszlopban található töréspont eltávolítása",
 	"removeLineBreakpoint": "Sorra vonatkozó töréspont eltávolítása",
@@ -18,5 +21,7 @@
 	"enableBreakpoints": "{0}. oszlopban található töréspont engedélyezése",
 	"enableBreakpointOnLine": "Sorszintű töréspont engedélyezése",
 	"addBreakpoint": "Töréspont hozzáadása",
+	"conditionalBreakpoint": "Feltételes töréspont hozzáadása...",
+	"addLogPoint": "Naplózási pont hozzáadása...",
 	"addConfiguration": "Konfiguráció hozzáadása..."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 709e548fd91..d46bba56fc8 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Hibák megjelenítése",
 	"noFolderWorkspaceDebugError": "Az aktív fájlon nem lehet hibakeresést végezni. Bizonyosodjon meg róla, hogy el van mentve a lemezre, és hogy az adott fájltípushoz telepítve van a megfelelő hibakeresési kiegészítő.",
 	"cancel": "Mégse",
-	"DebugTaskNotFound": "A(z) '{0}' preLaunchTask nem található.",
-	"taskNotTracked": "A(z) ${0} preLaunchTaskot nem lehet követni."
+	"DebugTaskNotFound": "A(z) '{0}' feladat nem található.",
+	"taskNotTracked": "A(z) '{0}' feladatot nem lehet követni."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 1cd253cec32..f20852131e1 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -18,6 +18,7 @@
 	"debugRequest": "A konfiguráció kérési típusa. Lehet \"launch\" vagy \"attach\".",
 	"debugServer": "Csak hibakeresési kiegészítők fejlesztéséhez: ha a port meg van adva, akkor a VS Code egy szerver módban futó hibakeresési illesztőhöz próbál meg csatlakozni.",
 	"debugPrelaunchTask": "A hibakeresési folyamat előtt futtatandó feladat.",
+	"debugPostDebugTask": "A hibakeresési folyamat vége után futtatandó feladat.",
 	"debugWindowsConfiguration": "Windows-specifikus indítási konfigurációs attribútumok.",
 	"debugOSXConfiguration": "OS X-specifikus indítási konfigurációs attribútumok.",
 	"debugLinuxConfiguration": "Linux-specifikus indítási konfigurációs attribútumok.",
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index cea278e8b7c..7a913054b25 100644
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterület-mappára vonatkozóan)",
 	"malicious tooltip": "A kiegészítőt korábban problémásnak jelezték.",
 	"malicious": "Rosszindulatú",
+	"disabled": "Letiltva",
+	"disabled globally": "Letiltva",
+	"disabled workspace": "Letiltva ezen a munkaterületen",
 	"disableAll": "Összes telepített kiegészítő letiltása",
 	"disableAllWorkspace": "Összes telepített kiegészítő letiltása a munkaterületre vonatkozóan",
 	"enableAll": "Összes kiegészítő engedélyezése",
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..70f8aa798f7
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Kiegészítő neve",
+	"extension id": "Kiegészítő azonosítója",
+	"preview": "Betekintő",
+	"builtin": "Beépített",
+	"publisher": "Kiadó neve",
+	"install count": "Telepítések száma",
+	"rating": "Értékelés",
+	"repository": "Forráskódtár",
+	"license": "Licenc",
+	"details": "Részletek",
+	"contributions": "Szolgáltatások",
+	"changelog": "Változtatási napló",
+	"dependencies": "Függőségek",
+	"noReadme": "Leírás nem található.",
+	"noChangelog": "Változtatási napló nem található.",
+	"noContributions": "Nincsenek szolgáltatások",
+	"noDependencies": "Nincsenek függőségek",
+	"settings": "Beállítások ({0})",
+	"setting name": "Név",
+	"description": "Leírás",
+	"default": "Alapértelmezett",
+	"debuggers": "Hibakeresők ({0})",
+	"debugger name": "Név",
+	"debugger type": "Típus",
+	"views": "Nézetek ({0})",
+	"view id": "Azonosító",
+	"view name": "Név",
+	"view location": "Hol?",
+	"localizations": "Lokalizációk ({0})",
+	"localizations language id": "Nyelv azonosítója",
+	"localizations language name": "Nyelv neve",
+	"localizations localized language name": "Nyelv neve (lokalizálva)",
+	"colorThemes": "Színtémák ({0})",
+	"iconThemes": "Ikontémák ({0})",
+	"colors": "Színek ({0})",
+	"colorId": "Azonosító",
+	"defaultDark": "Alapértelmezett sötét",
+	"defaultLight": "Alapértelmezett világos",
+	"defaultHC": "Alapértelmezett nagy kontrasztú",
+	"JSON Validation": "JSON-validációk ({0})",
+	"fileMatch": "Fájlegyezés",
+	"schema": "Séma",
+	"commands": "Parancsok ({0})",
+	"command name": "Név",
+	"keyboard shortcuts": "Billentyűparancsok",
+	"menuContexts": "Helyi menük",
+	"languages": "Nyelvek ({0})",
+	"language id": "Azonosító",
+	"language name": "Név",
+	"file extensions": "Fájlkiterjesztések",
+	"grammar": "Nyelvtan",
+	"snippets": "Kódtöredékek"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 51523b2194e..f355d1508ab 100644
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -8,7 +8,7 @@
 	],
 	"neverShowAgain": "Ne jelenítse meg újra",
 	"searchMarketplace": "Keresés a piactéren",
-	"showLanguagePackExtensions": "A piactéren található olyan kiegészítő, ami lefordítja a(z) '.{0}' VS Code-ot '{0}' nyelvre",
+	"showLanguagePackExtensions": "A piactéren található olyan kiegészítő, ami lefordítja a VS Code-ot '{0}' nyelvre",
 	"dynamicWorkspaceRecommendation": "Ez a kiegészítő lehet, hogy érdekelni fogja, mert népszerű a(z) {0} forráskódtár felhasználói körében.",
 	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
 	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 33a83814b95..5ef5e09669c 100644
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "Ajánlott",
 	"otherRecommendedExtensions": "További ajánlatok",
 	"workspaceRecommendedExtensions": "Ajánlott a munkaterülethez",
-	"builtInExtensions": "Beépített",
+	"builtInExtensions": "Funkciók",
+	"builtInThemesExtensions": "Témák",
+	"builtInBasicsExtensions": "Nyelvek",
 	"searchExtensions": "Kiegészítők keresése a piactéren",
 	"sort by installs": "Rendezés a telepítések száma szerint",
 	"sort by rating": "Rendezés értékelés szerint",
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index 7b1855ae0b2..5aaad4bc1e6 100644
--- a/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "Szövegfájlszerkesztő",
 	"createFile": "Fájl létrehozása",
+	"relaunchWithIncreasedMemoryLimit": "Újraindítás",
+	"configureMemoryLimit": "Beállítás",
 	"fileEditorWithInputAriaLabel": "{0}. Szövegfájlszerkesztő.",
 	"fileEditorAriaLabel": "Szövegfájlszerkesztő"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index fd4fbe037e7..95afc5f3a16 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,8 +34,10 @@
 	"confirmDeleteMessageFolder": "Törli a(z) '{0}' nevű mappát és annak teljes tartalmát? ",
 	"confirmDeleteMessageFile": "Véglegesen törli a(z) '{0}' nevű fájlt?",
 	"irreversible": "A művelet nem vonható vissza!",
-	"cancel": "Mégse",
-	"permDelete": "Végleges törlés",
+	"binFailed": "Nem sikerült törölni a lomtár használatával. Szeretné helyette véglegesen törölni?",
+	"trashFailed": "Nem sikerült törölni a kuka használatával. Szeretné helyette véglegesen törölni?",
+	"deletePermanentlyButtonLabel": "&&Törlés véglegesen",
+	"retryButtonLabel": "Új&&rapróbálkozás",
 	"importFiles": "Fájlok importálása",
 	"confirmOverwrite": "A célmappában már van ilyen nevű mappa vagy fájl. Le szeretné cserélni?",
 	"replaceButtonLabel": "&&Csere",
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 03c5761aece..3cbfd1d59d4 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -35,8 +35,10 @@
 	"hotExit": "Meghatározza, hogy a nem mentett fájlokra emlékezzen-e az alkalmazás a munkamenetek között, így ki lehet hagyni a mentéssel kapcsolatos felugró ablakokat kilépésnél.",
 	"useExperimentalFileWatcher": "Új, kísérleti fájlfigyelő használata.",
 	"defaultLanguage": "Az új fájlokhoz alapértelmezetten hozzárendelt nyelv.",
+	"maxMemoryForLargeFilesMB": "Az alkalmazás által nagy fájlok megnyitása során használható memória új korlátja megabájtban. Ha nagyobb korláttal szeretné indítani az alkalmazást, használja a --max-memory=ÚJMÉRET kapcsolót a parancssorban.",
 	"editorConfigurationTitle": "Szerkesztőablak",
 	"formatOnSave": "Fájlok formázása mentéskor. Az adott nyelvhez rendelkezésre kell állni formázónak, nem lehet beállítva automatikus mentés, és a szerkesztő nem állhat éppen lefelé.",
+	"formatOnSaveTimeout": "Időkorlát mentéskor végzett formázások esetén. Meghatároz egy időkorlátot ezredmásodpercben a formatOnSave-parancsok számára. Az ennél hosszabb ideig tartó parancsok meg lesznek szakítva.",
 	"explorerConfigurationTitle": "Fájlkezelő",
 	"openEditorsVisible": "A megnyitott szerkesztőablakok panelen megjelenített szerkesztőablakok száma.",
 	"autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.",
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index c0be92f2f54..dcbc1b87cbf 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -13,7 +13,9 @@
 	"dropFolder": "Szeretné hozzáadni a mappát a munkaterülethez?",
 	"addFolders": "Mappák hozzá&&adása",
 	"addFolder": "Mappa hozzá&&adása",
+	"confirmRootsMove": "Szeretné módosítani több gyökérmappa sorrendjét a munkaterületen belül?",
 	"confirmMultiMove": "Át szeretné helyezni a következő {0} fájlt?",
+	"confirmRootMove": "Szeretné módosítani a(z) '{0}' gyökérmappa sorrendjét a munkaterületen belül?",
 	"confirmMove": "Át szeretné helyezni a(z) '{0}' nevű fájlt?",
 	"doNotAskAgain": "Ne kérdezze meg újra",
 	"moveButtonLabel": "&&Áthelyezés",
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..c2a0ca800e8
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "HTML-előnézet"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..d5c321fd607
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "Érvénytelen bemenet a szerkesztőablakból."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..6f1887b8477
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Fejlesztői"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..89f213109cf
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Webview-fejlesztőeszközök megnyitása",
+	"refreshWebviewLabel": "Webview-k újratöltése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index ecee49b1a31..cb2d1444c69 100644
--- a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "Szeretné a VS Code felületét {0} nyelvűre állítani és újraindítani az alkalmazást?",
+	"yes": "Igen",
+	"no": "Nem",
+	"doNotAskAgain": "Ne kérdezze meg újra",
 	"JsonSchema.locale": "A felhasználói felületen használt nyelv.",
 	"vscode.extension.contributes.localizations": "Lokalizációkat szolgáltat a szerkesztőhöz",
 	"vscode.extension.contributes.localizations.languageId": "Annak a nyelvnek az azonosítója, amelyre a megjelenített szövegek fordítva vannak.",
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..c1008a9652d
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Másolás",
+	"copyMarkerMessage": "Üzenet másolása"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..0eecc9c3575
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Összesen {0} probléma",
+	"filteredProblems": "{0} probléma megjelenítve (összesen: {1})"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..e26c8c27c96
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "Problémák",
+	"tooltip.1": "A fájlban 1 probléma található",
+	"tooltip.N": "A fájlban {0} probléma található",
+	"markers.showOnFile": "Fájlokban és mappákban található hibák és figyelmeztetések megjelenítése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..692df32c15d
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,44 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Nézet",
+	"problems.view.toggle.label": "Problémák be- és kikapcsolása (hiba, figyelmeztetés, információ)",
+	"problems.view.focus.label": "Váltás a problémákra (hiba, figyelmeztetés, információ)",
+	"problems.panel.configuration.title": "Problémák-nézet",
+	"problems.panel.configuration.autoreveal": "Meghatározza, hogy a problémák nézet automatikusan felfedje-e a fájlokat, amikor megnyitja őket.",
+	"markers.panel.title.problems": "Problémák",
+	"markers.panel.aria.label.problems.tree": "Problémák fájlonként csoportosítva",
+	"markers.panel.no.problems.build": "A munkaterületen eddig egyetlen hiba sem lett érzékelve.",
+	"markers.panel.no.problems.filters": "A megadott szűrőfeltételnek egyetlen elem sem felel meg.",
+	"markers.panel.action.filter": "Problémák szűrése",
+	"markers.panel.filter.placeholder": "Szűrés típus vagy szöveg alapján",
+	"markers.panel.filter.errors": "hibák",
+	"markers.panel.filter.warnings": "figyelmeztetések",
+	"markers.panel.filter.infos": "információk",
+	"markers.panel.single.error.label": "1 hiba",
+	"markers.panel.multiple.errors.label": "{0} hiba",
+	"markers.panel.single.warning.label": "1 figyelmeztetés",
+	"markers.panel.multiple.warnings.label": "{0} figyelmeztetés",
+	"markers.panel.single.info.label": "1 információ",
+	"markers.panel.multiple.infos.label": "{0} információ",
+	"markers.panel.single.unknown.label": "1 ismeretlen",
+	"markers.panel.multiple.unknowns.label": "{0} ismeretlen",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} {1} problémával",
+	"problems.tree.aria.label.marker.relatedInformation": "Ez a probléma {0} helyre hivatkozik.",
+	"problems.tree.aria.label.error.marker": "{0} által generált hiba: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.error.marker.nosource": "Hiba: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "{0} által generált figyelmeztetés: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Figyelmeztetés: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.info.marker": "{0} által generált információ: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Információ: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.marker": "{0} által generált probléma: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Probléma: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{0}, sor: {1}, oszlop: {2}, a következő helyen: {3}",
+	"errors.warnings.show.label": "Hibák és figyelmezetések megjelenítése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 65dac081944..b0047af883c 100644
--- a/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Kimenet be- és kikapcsolása",
 	"clearOutput": "Kimenet törlése",
 	"toggleOutputScrollLock": "Kimenet görgetési zárának be- és kikapcsolása",
-	"switchToOutput.label": "Váltás a kimenetre"
+	"switchToOutput.label": "Váltás a kimenetre",
+	"openInLogViewer": "Naplófájl megnyitása"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 3745c84cea4..0e30f573276 100644
--- a/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Kimenet",
 	"logViewer": "Naplófájl-megjelenítő",
 	"viewCategory": "Nézet",
-	"clearOutput.label": "Kimenet törlése"
+	"clearOutput.label": "Kimenet törlése",
+	"openActiveLogOutputFile": "Nézet: Aktív napló kimeneti fájljának megnyitása"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index e26ae7fdac0..76f9adaac9a 100644
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -7,6 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"keybindingsInputName": "Billentyűparancsok",
+	"showDefaultKeybindings": "Alapértelmezett billentyűparancsok megjelenítése",
+	"showUserKeybindings": "Felhasználói billentyűparancsok megjelenítése",
 	"SearchKeybindings.AriaLabel": "Billentyűparancsok keresése",
 	"SearchKeybindings.Placeholder": "Billentyűparancsok keresése",
 	"sortByPrecedene": "Rendezés precedencia szerint",
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 6c9f746df9e..28936cbbe73 100644
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Következő bele foglalt keresési minta megjelenítése",
 	"previousSearchIncludePattern": "Előző bele foglalt keresési minta megjelenítése",
-	"nextSearchExcludePattern": "Következő kizáró keresési minta megjelenítése",
-	"previousSearchExcludePattern": "Előző kizáró keresési minta megjelenítése",
 	"nextSearchTerm": "Következő keresőkifejezés megjelenítése",
 	"previousSearchTerm": "Előző keresőkifejezés megjelenítése",
 	"showSearchViewlet": "Keresés megjelenítése",
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchView.i18n.json
index 414222489bd..5e9fc946994 100644
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,9 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Keresési részletek be- és kikapcsolása",
-	"searchScope.includes": "bele foglalt fájlok",
-	"label.includes": "Keresésbe bele foglalt fájlok",
-	"searchScope.excludes": "kizárt fájlok",
-	"label.excludes": "Keresésből kizárt fájlok",
+	"searchIncludeExclude.label": "belefoglalt és kizárt fájlok",
+	"searchIncludeExclude.ariaLabel": "Keresésbe belefoglalási és kizárási minták",
+	"searchIncludeExclude.placeholder": "Példa: src,!*.ts, test/**/*.log",
 	"replaceAll.confirmation.title": "Összes cseréje",
 	"replaceAll.confirm.button": "&&Csere",
 	"replaceAll.occurrence.file.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 72c95a38758..45757d97a23 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Egy problémaminta vagy egy szolgáltatott vagy elődefiniált problémaminta neve. Elhagyható, ha az alapként használandó minta meg van adva.",
 	"ProblemMatcherSchema.base": "A alapként használni kívánt problémaillesztő neve.",
 	"ProblemMatcherSchema.owner": "A probléma tulajdonosa a Code-on belül. Elhagyható, ha az alapként használt minta meg van adva. Alapértelmezett értéke 'external', ha nem létezik és az alapként használt minta nincs meghatározva.",
+	"ProblemMatcherSchema.source": "A diagnosztika forrásának emberek által is értelmezhető leírása, pl. 'typescript' vagy 'super lint'.",
 	"ProblemMatcherSchema.severity": "Az elkapott problémák alapértelmezett súlyossága. Ez az érték van használva, ha a minta nem definiál illesztési csoportot a súlyossághoz.",
 	"ProblemMatcherSchema.applyTo": "Meghatározza, hogy a szöveges dokumentumhoz jelentett probléma megnyitott, bezárt vagy minden dokumentumra legyen alkalmazva.",
 	"ProblemMatcherSchema.fileLocation": "Meghatározza, hogy a problémamintában talált fájlnevek hogyan legyenek értelmezve.",
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 65bf3fa4359..5971de78c2e 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "A feladatot egyetlen csoporthoz sem rendeli",
 	"JsonSchema.tasks.group": "Meghatározza a feladat végrehajtási csoportját. A \"build\" esetén a buildelési csoportba, a \"test\" esetén a tesztelési csoportba kerül bele a feladat.",
 	"JsonSchema.tasks.type": "Meghatározza, hogy a feladat folyamatként van-e végrehajtva vagy egy parancsként a shellben.",
+	"JsonSchema.command.quotedString.value": "A parancs tényleges értéke",
+	"JsonSchema.tasks.quoting.escape": "A karaktereket a shell saját feloldókarakterével oldja fel (pl. PowerShell alatt a `, míg bash alatt a \\ karakterrel).",
+	"JsonSchema.tasks.quoting.strong": "Az argumentumot a shell erős idézőjel-karakterével veszi körül (pl. PowerShell és bash alatt a \" karakterrel). ",
+	"JsonSchema.tasks.quoting.weak": "Az argumentumot a shell erős idézőjel-karakterével veszi körül (pl. PowerShell és bash alatt a ' karakterrel). ",
+	"JsonSchema.command.quotesString.quote": "Hogyan legyen idézőjelezve a parancs értéke.",
+	"JsonSchema.command": "A végrehajtandó parancs. Lehet egy külső parancs vagy egy rendszerparancs.",
+	"JsonSchema.args.quotedString.value": "Az argumentum tényleges értéke",
+	"JsonSchema.args.quotesString.quote": "Hogyan legyen idézőjelezve az argumentum értéke.",
+	"JsonSchema.tasks.args": "A parancs meghívásakor átadott argumentumok.",
 	"JsonSchema.tasks.label": "A feladat felhasználói felületen megjelenő neve",
 	"JsonSchema.version": "A konfiguráció verziószáma",
 	"JsonSchema.tasks.identifier": "A feladat felhasználó által definiált azonosítója, amivel hivatkozni lehet a feladatra a lauch.json-ban vagy egy dependsOn-utasításban.",
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index efbb0ead2d7..ab9830c1cef 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,11 @@
 	],
 	"tasksCategory": "Feladatok",
 	"ConfigureTaskRunnerAction.label": "Feladat beállítása",
-	"problems": "Problémák",
+	"totalErrors": "{0} hiba",
+	"totalWarnings": "{0} figyelmeztetés",
+	"totalInfos": "{0} információ",
 	"building": "Buildelés...",
-	"manyMarkers": "99+",
+	"manyProblems": "10k+",
 	"runningTasks": "Futó feladatok megjelenítése",
 	"tasks": "Feladatok",
 	"TaskSystem.noHotSwap": "A feladatvégrehajtó motor megváltoztatása egy futó, aktív feladat esetén az ablak újraindítását igényli.",
@@ -46,8 +48,8 @@
 	"recentlyUsed": "legutóbb futtatott feladatok",
 	"configured": "konfigurált feladatok",
 	"detected": "talált feladatok",
-	"TaskService.ignoredFolder": "A következő munkaterületi mappák figyelmen kívül vannak hagyva, mert 0.1.0-s verziójú feladatkonfigurációt használnak: {0}",
 	"TaskService.notAgain": "Ne jelenítse meg újra",
+	"TaskService.ignoredFolder": "A következő munkaterületi mappák figyelmen kívül vannak hagyva, mert 0.1.0-s verziójú feladatkonfigurációt használnak: {0}",
 	"TaskService.pickRunTask": "Válassza ki a futtatandó feladatot!",
 	"TaslService.noEntryToRun": "Nincs futtatandó feladat. Feladatok konfigurálása...",
 	"TaskService.fetchingBuildTasks": "Buildelési feladatok lekérése...",
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 859b71eada3..fc54f4c27dc 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Figyelmeztetés: az options.cwd értékének string típusúnak kell lennie. A következő érték figyelmen kívül van hagyva: {0}.",
+	"ConfigurationParser.inValidArg": "Hiba: a parancssori argumentum egy string vagy egy idézőjeles string lehet. A megadott érték:\n{0}",
 	"ConfigurationParser.noargs": "Hiba: a parancssori argumentumokat string típusú tömbként kell megadni. A megadott érték:\n{0}",
 	"ConfigurationParser.noShell": "Figyelmeztetés: a shellkonfiguráció csak akkor támogatott, ha a feladat a terminálban van végrehajtva.",
 	"ConfigurationParser.noName": "Hiba: a deklarációs hatókörben lévő problémailleszőnek kötelező nevet adni:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Hiba: a(z) '{0}' feladatkonfigurációból hiányzik a kötelező '{1}' tulajdonság. A feladatkonfiguráció figyelmen kívül lesz hagyva.",
 	"ConfigurationParser.notCustom": "Hiba: a feladat nem egyedi feladatként van definiálva. A konfiguráció figyelmen kívül lesz hagyva.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Hiba: a feladatnak rendelkeznie kell adni taskName tulajdonsággal. A feladat figyelmen kívül lesz hagyva.\n{0}\n",
-	"taskConfiguration.shellArgs": "Figyelmeztetés: a(z) '{0}' feladat egy rendszerparancs, és az argumentumok egyikében escape-elés nélküli szóköz található. A megfelelő idézőjelezés érdekében olvassza bele az argumentumokat a parancsba.",
 	"taskConfiguration.noCommandOrDependsOn": "Hiba: a(z) '{0}' feladat nem ad meg parancsot, és nem definiálja a dependsOn tulajdonságot sem. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
 	"taskConfiguration.noCommand": "Hiba: a(z) '{0}' feladathoz nincs definiálva a parancs. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "A feladatok 2.0.0-s verziója nem támogatja a globális, operációs rendszer-specifikus feladatokat. Alakítsa át őket operációs rendszer-specifikus parancsot tartalmazó feladattá. Az érintett feladatok:\n{0}"
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 6ebf74d1655..a1e04bdb7c0 100644
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -51,5 +51,9 @@
 	"workbench.action.terminal.hideFindWidget": "Keresőmodul elrejtése",
 	"nextTerminalFindTerm": "Következő keresési kifejezés megjelenítése",
 	"previousTerminalFindTerm": "Előző keresési kifejezés megjelenítése",
-	"quickOpenTerm": "Aktív terminál váltása"
+	"quickOpenTerm": "Aktív terminál váltása",
+	"workbench.action.terminal.focusPreviousCommand": "Váltás az előző parancsra",
+	"workbench.action.terminal.focusNextCommand": "Váltás a következő parancsra",
+	"workbench.action.terminal.selectToPreviousCommand": "Előző parancs kiválasztása",
+	"workbench.action.terminal.selectToNextCommand": "Következő parancs kiválasztása"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index b869ee23431..f1c61bd70f2 100644
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Másolás",
+	"split": "Kettéosztás",
 	"paste": "Beillesztés",
 	"selectAll": "Összes kijelölése",
-	"clear": "Törlés",
-	"split": "Kettéosztás"
+	"clear": "Törlés"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..d682cbdfb4c
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Kiadási jegyzék: {0}",
+	"unassigned": "nincs hozzárendelve"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 41b05f04072..150b707b38f 100644
--- a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "Később",
-	"unassigned": "nincs hozzárendelve",
 	"releaseNotes": "Kiadási jegyzék",
 	"showReleaseNotes": "Kiadási jegyzék megjelenítése",
 	"read the release notes": "Üdvözöljük a {0} v{1} verziójában. Szeretné megtekinteni a kiadási jegyzéket?",
diff --git a/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..983527bcdae
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "webview-szerkesztő"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..37523ae01ca
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.optOutNotice": "Segítsen a VS Code tökéletesítésében azzal, hogy engedélyezi a Microsoft számára a használati adatok gyűjtését! Olvasssa el az [adatvédelmi nyilatkozatot]({0}), és tudja meg, hogyan [kapcsolhatja ki]({1}) ezt a funkciót.",
+	"telemetryOptOut.optInNotice": "Segítsen a VS Code tökéletesítésében azzal, hogy engedélyezi a Microsoft számára a használati adatok gyűjtését! Olvasssa el az [adatvédelmi nyilatkozatot]({0}), és tudja meg, hogyan [kapcsolhatja be]({1}) ezt a funkciót.",
+	"telemetryOptOut.readMore": "További információk"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..4dd179c8823
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "A ${workspaceFolder} értékét nem lehet feloldani egy többmappás munkaterületen. Pontosítsa a változó hatókörét a : karakterrel és a mappa nevének megadásával.",
+	"canNotResolveWorkspaceFolder": "A ${workspaceFolder} értékét nem lehet feloldani. Nyisson meg egy mappát!",
+	"canNotResolveFolderBasenameMultiRoot": "A ${workspaceFolderBasename} értékét nem lehet feloldani egy többmappás munkaterületen. Pontosítsa a változó hatókörét a : karakterrel és a mappa nevének megadásával.",
+	"canNotResolveFolderBasename": "A ${workspaceFolderBasename} értékét nem lehet feloldani. Nyisson meg egy mappát!",
+	"canNotResolveLineNumber": "A ${lineNumber} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
+	"canNotResolveSelectedText": "A ${selectedText} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
+	"canNotResolveFile": "A ${file} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
+	"canNotResolveRelativeFile": "A ${relativeFile} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
+	"canNotResolveFileDirname": "A ${fileDirname} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
+	"canNotResolveFileExtname": "A ${fileExtname} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
+	"canNotResolveFileBasename": "A ${fileBasename} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
+	"canNotResolveFileBasenameNoExtension": "A ${fileBasenameNoExtension} értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..a1522b0bc3e
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Igen",
+	"cancelButton": "Mégse"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index b79eb0a2991..3008795a9ef 100644
--- a/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,7 @@
 	"neverShowAgain": "Ne jelenítse meg újra",
 	"netVersionError": "A működéshez Microsoft .NET-keretrendszer 4.5 szükséges. A telepítéshez kövesse az alábbi hivatkozást!",
 	"learnMore": "Utasítások",
-	"enospcError": "A {0} kezd kifogyni a fájlleírókból. Kövesse az utasításokat az alábbi hivatkozáson a probléma megoldásához!",
+	"enospcError": "A {0} nem tudja figyelni a fájlváltozásokat egy ilyen nagy munkaterületen. Kövesse az utasításokat az alábbi hivatkozáson a probléma megoldásához!",
 	"binFailed": "A következő fájlt nem sikerült a lomtárba helyezni: '{0}'",
 	"trashFailed": "A(z) {0} kukába helyezése nem sikerült"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
index 64e3d8c1f61..639f690d07a 100644
--- a/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,7 @@
 	"fileInvalidPath": "Érvénytelen fájlerőforrás ({0})",
 	"fileIsDirectoryError": "A fájl egy könyvtár",
 	"fileNotModifiedError": "A fájl azóta nem módosult",
-	"fileTooLargeForHeapError": "A fájlméret nagyobb, mint az ablak memóriakorlátja. Próbálja meg a következő parancsot futtatni: code --max-memory=<ÚJ MÉRET>",
+	"fileTooLargeForHeapError": "A fájlméret túllépi az alapértelmezett memóriakorlátot.  A jelenlegi beállítás szerint az alkalmazás újraindul {0}MB-os korláttal.",
 	"fileTooLargeError": "A fájl túl nagy a megnyitáshoz",
 	"fileNotFoundError": "Fájl nem található ({0})",
 	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
diff --git a/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index 9a73f11d6e7..d15b9a685b2 100644
--- a/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} – {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Mégse"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index ca563e236ba..b6c32f7bccf 100644
--- a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -10,6 +10,7 @@
 	"vscode.extension.contributes.grammars.language": "Annak a nyelvnek az azonosítója, amely számára szolgáltatva van ez a szintaxis.",
 	"vscode.extension.contributes.grammars.scopeName": "A tmLanguage-fájl által használt TextMate-hatókör neve.",
 	"vscode.extension.contributes.grammars.path": "A tmLanguage-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához képest, és általában './syntaxes/'-zal kezdődik.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Hatókörnév-nyelvazonosító kulcs-érték párokat tartalmazó objektum, ha a nyelvtan tartalmaz beágyazott nyelveket.",
+	"vscode.extension.contributes.grammars.embeddedLanguages": "Hatókörnevek leképezése nyelvazonosítókra, ha a nyelvtan tartalmaz beágyazott nyelveket.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Hatókörnevek leképezése tokentípusokra.",
 	"vscode.extension.contributes.grammars.injectTo": "Azon nyelvi hatókörök nevei, ahová be lesz ágyazva ez a nyelvtan."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 2afc247830d..83e21414598 100644
--- a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
 	"invalid.injectTo": "A `contributes.{0}.injectTo` értéke érvénytelen. Az értéke egy tömb lehet, ami nyelvhatókörök neveit tartalmazza. A megadott érték: {1}",
 	"invalid.embeddedLanguages": "A `contributes.{0}.embeddedLanguages` értéke érvénytelen. Az értéke egy hatókörnév-nyelv kulcs-érték párokat tartalmazó objektum lehet. A megadott érték: {1}",
+	"invalid.tokenTypes": "A `contributes.{0}.tokenTypes` értéke érvénytelen. Az értéke egy hatókörnév-tokentípus kulcs-érték párokat tartalmazó objektum lehet. A megadott érték: {1}",
 	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
 	"no-tm-grammar": "Nincs TM Grammar regisztrálva ehhez a nyelvhez."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..49766496907
--- /dev/null
+++ b/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "Server di linguaggio CSS",
+	"folding.start": "Inizio di una regione riducibile",
+	"folding.end": "Fine di una regione riducibile"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css-language-features/package.i18n.json b/i18n/ita/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..35517becb5b
--- /dev/null
+++ b/i18n/ita/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Funzionalità del linguaggio CSS",
+	"description": "Offre un supporto avanzato per i file CSS, LESS e SCSS",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
+	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
+	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
+	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
+	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
+	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
+	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
+	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
+	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
+	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
+	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
+	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
+	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
+	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
+	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
+	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
+	"css.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio CSS.",
+	"css.validate.title": "Controlla la convalida CSS e le gravità dei problemi.",
+	"css.validate.desc": "Abilita o disabilita tutte le convalide",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
+	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
+	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
+	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
+	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
+	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
+	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
+	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
+	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
+	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
+	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
+	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
+	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
+	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
+	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
+	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
+	"less.validate.title": "Controlla la convalida LESS e le gravità dei problemi.",
+	"less.validate.desc": "Abilita o disabilita tutte le convalide",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
+	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
+	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
+	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
+	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
+	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
+	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
+	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
+	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
+	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
+	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
+	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
+	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
+	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
+	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
+	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
+	"scss.validate.title": "Controlla la convalida SCSS e le gravità dei problemi.",
+	"scss.validate.desc": "Abilita o disabilita tutte le convalide",
+	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"css.colorDecorators.enable.deprecationMessage": "L'impostazione `css.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
+	"scss.colorDecorators.enable.deprecationMessage": "L'impostazione `scss.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
+	"less.colorDecorators.enable.deprecationMessage": "L'impostazione `less.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css/package.i18n.json b/i18n/ita/extensions/css/package.i18n.json
index 35517becb5b..35229bd6699 100644
--- a/i18n/ita/extensions/css/package.i18n.json
+++ b/i18n/ita/extensions/css/package.i18n.json
@@ -5,77 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Funzionalità del linguaggio CSS",
-	"description": "Offre un supporto avanzato per i file CSS, LESS e SCSS",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"css.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio CSS.",
-	"css.validate.title": "Controlla la convalida CSS e le gravità dei problemi.",
-	"css.validate.desc": "Abilita o disabilita tutte le convalide",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"less.validate.title": "Controlla la convalida LESS e le gravità dei problemi.",
-	"less.validate.desc": "Abilita o disabilita tutte le convalide",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"scss.validate.title": "Controlla la convalida SCSS e le gravità dei problemi.",
-	"scss.validate.desc": "Abilita o disabilita tutte le convalide",
-	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"css.colorDecorators.enable.deprecationMessage": "L'impostazione `css.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"scss.colorDecorators.enable.deprecationMessage": "L'impostazione `scss.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"less.colorDecorators.enable.deprecationMessage": "L'impostazione `less.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/commands.i18n.json b/i18n/ita/extensions/git/out/commands.i18n.json
index 3ce147e64bc..13f1df3d818 100644
--- a/i18n/ita/extensions/git/out/commands.i18n.json
+++ b/i18n/ita/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "OK",
 	"push with tags success": "Il push con tag è riuscito.",
 	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
-	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}'.",
 	"never again": "OK, non visualizzare più",
 	"no remotes to publish": "Il repository non contiene elementi remoti configurati come destinazione della pubblicazione.",
 	"no changes stash": "Non ci sono modifiche da accantonare.",
diff --git a/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..8313a5f7e1b
--- /dev/null
+++ b/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "Server di linguaggio HTML",
+	"folding.start": "Inizio di una regione riducibile",
+	"folding.end": "Fine di una regione riducibile"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html-language-features/package.i18n.json b/i18n/ita/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..b237335f1d3
--- /dev/null
+++ b/i18n/ita/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Funzionalità del linguaggio HTML",
+	"description": "Offre un supporto avanzato sul linguaggio per i file HTML, Razor e Handlebars",
+	"html.format.enable.desc": "Abilita/Disabilita il formattatore HTML predefinito",
+	"html.format.wrapLineLength.desc": "Numero massimo di caratteri per riga (0 = disabilita).",
+	"html.format.unformatted.desc": "Elenco di tag, separati da virgole, che non devono essere riformattati. Con 'null' viene usata l'impostazione predefinita che prevede l'uso di tutti i tag elencati in https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Elenco di tag, separati da virgole, in cui il contenuto non deve essere riformattato. Per impostazione predefinita, con 'null' viene usato il tag 'pre'.",
+	"html.format.indentInnerHtml.desc": "Imposta un rientro per le sezioni <head> e <body>.",
+	"html.format.preserveNewLines.desc": "Indica se è necessario mantenere interruzioni di riga esistenti prima degli elementi. Funziona solo prima degli elementi e non all'interno di tag o per il testo.",
+	"html.format.maxPreserveNewLines.desc": "Numero massimo di interruzioni di riga da mantenere in un unico blocco. Per non impostare un numero massimo, usare 'null'.",
+	"html.format.indentHandlebars.desc": "Applica la formattazione e imposta un rientro per {{#foo}} e {{/foo}}.",
+	"html.format.endWithNewline.desc": "Termina con un carattere di nuova riga.",
+	"html.format.extraLiners.desc": "Elenco di tag, separati da virgole, che devono essere preceduti da un carattere di nuova riga. Con 'null' viene usata l'impostazione predefinita \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Esegue il wrapping degli attributi.",
+	"html.format.wrapAttributes.auto": "Esegue il wrapping degli attributi solo quando viene superata la lunghezza di riga.",
+	"html.format.wrapAttributes.force": "Esegue il wrapping di ogni attributo ad eccezione del primo.",
+	"html.format.wrapAttributes.forcealign": "Esegue il wrapping di ogni attributo ad eccezione del primo e mantiene l'allineamento.",
+	"html.format.wrapAttributes.forcemultiline": "Esegue il wrapping di ogni attributo.",
+	"html.suggest.angular1.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag e proprietà di Angular V1.",
+	"html.suggest.ionic.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di Ionic.",
+	"html.suggest.html5.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di HTML5.",
+	"html.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio HTML.",
+	"html.validate.scripts": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli script incorporati.",
+	"html.validate.styles": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli stili incorporati.",
+	"html.autoClosingTags": "Abilita/Disabilita la chiusura automatica dei tag HTML."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html/package.i18n.json b/i18n/ita/extensions/html/package.i18n.json
index 08d31d44db6..35229bd6699 100644
--- a/i18n/ita/extensions/html/package.i18n.json
+++ b/i18n/ita/extensions/html/package.i18n.json
@@ -5,30 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Funzionalità del linguaggio HTML",
-	"description": "Offre un supporto avanzato sul linguaggio per i file HTML, Razor e Handlebars",
-	"html.format.enable.desc": "Abilita/Disabilita il formattatore HTML predefinito",
-	"html.format.wrapLineLength.desc": "Numero massimo di caratteri per riga (0 = disabilita).",
-	"html.format.unformatted.desc": "Elenco di tag, separati da virgole, che non devono essere riformattati. Con 'null' viene usata l'impostazione predefinita che prevede l'uso di tutti i tag elencati in https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Elenco di tag, separati da virgole, in cui il contenuto non deve essere riformattato. Per impostazione predefinita, con 'null' viene usato il tag 'pre'.",
-	"html.format.indentInnerHtml.desc": "Imposta un rientro per le sezioni <head> e <body>.",
-	"html.format.preserveNewLines.desc": "Indica se è necessario mantenere interruzioni di riga esistenti prima degli elementi. Funziona solo prima degli elementi e non all'interno di tag o per il testo.",
-	"html.format.maxPreserveNewLines.desc": "Numero massimo di interruzioni di riga da mantenere in un unico blocco. Per non impostare un numero massimo, usare 'null'.",
-	"html.format.indentHandlebars.desc": "Applica la formattazione e imposta un rientro per {{#foo}} e {{/foo}}.",
-	"html.format.endWithNewline.desc": "Termina con un carattere di nuova riga.",
-	"html.format.extraLiners.desc": "Elenco di tag, separati da virgole, che devono essere preceduti da un carattere di nuova riga. Con 'null' viene usata l'impostazione predefinita \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Esegue il wrapping degli attributi.",
-	"html.format.wrapAttributes.auto": "Esegue il wrapping degli attributi solo quando viene superata la lunghezza di riga.",
-	"html.format.wrapAttributes.force": "Esegue il wrapping di ogni attributo ad eccezione del primo.",
-	"html.format.wrapAttributes.forcealign": "Esegue il wrapping di ogni attributo ad eccezione del primo e mantiene l'allineamento.",
-	"html.format.wrapAttributes.forcemultiline": "Esegue il wrapping di ogni attributo.",
-	"html.suggest.angular1.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag e proprietà di Angular V1.",
-	"html.suggest.ionic.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di Ionic.",
-	"html.suggest.html5.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di HTML5.",
-	"html.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio HTML.",
-	"html.validate.scripts": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli script incorporati.",
-	"html.validate.styles": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli stili incorporati.",
-	"html.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi.",
-	"html.autoClosingTags": "Abilita/Disabilita la chiusura automatica dei tag HTML."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..b9cca5241bb
--- /dev/null
+++ b/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "Server di linguaggio JSON"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json-language-features/package.i18n.json b/i18n/ita/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..6ae49c6efe4
--- /dev/null
+++ b/i18n/ita/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"description": "Fornisce supporto avanzato del linguaggio per i file JSON.",
+	"json.schemas.desc": "Associa schemi a file JSON nel progetto corrente",
+	"json.schemas.url.desc": "URL di uno schema o percorso relativo di uno schema nella directory corrente",
+	"json.schemas.fileMatch.desc": "Matrice di criteri dei file da usare per la ricerca durante la risoluzione di file JSON in schemi.",
+	"json.schemas.fileMatch.item.desc": "Criteri dei file che possono contenere '*' da usare per la ricerca durante la risoluzione di file JSON in schemi.",
+	"json.schemas.schema.desc": "Definizione dello schema per l'URL specificato. È necessario specificare lo schema per evitare accessi all'URL dello schema.",
+	"json.format.enable.desc": "Abilita/Disabilita il formattatore JSON predefinito (richiede il riavvio)",
+	"json.tracing.desc": "Traccia le comunicazioni tra Visual Studio Code e il server di linguaggio JSON.",
+	"json.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"json.colorDecorators.enable.deprecationMessage": "L'impostazione `json.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json/package.i18n.json b/i18n/ita/extensions/json/package.i18n.json
index b6f387db316..35229bd6699 100644
--- a/i18n/ita/extensions/json/package.i18n.json
+++ b/i18n/ita/extensions/json/package.i18n.json
@@ -5,17 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Funzionalità del linguaggio JSON",
-	"description": "Fornisce supporto avanzato del linguaggio per i file JSON.",
-	"json.schemas.desc": "Associa schemi a file JSON nel progetto corrente",
-	"json.schemas.url.desc": "URL di uno schema o percorso relativo di uno schema nella directory corrente",
-	"json.schemas.fileMatch.desc": "Matrice di criteri dei file da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-	"json.schemas.fileMatch.item.desc": "Criteri dei file che possono contenere '*' da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-	"json.schemas.schema.desc": "Definizione dello schema per l'URL specificato. È necessario specificare lo schema per evitare accessi all'URL dello schema.",
-	"json.format.enable.desc": "Abilita/Disabilita il formattatore JSON predefinito (richiede il riavvio)",
-	"json.tracing.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio JSON.",
-	"json.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"json.colorDecorators.enable.deprecationMessage": "L'impostazione `json.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"json.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..eb5c477e4c1
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "Impossibile caricare 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..c46a3464cc4
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[Anteprima] {0}",
+	"previewTitle": "Anteprima {0}"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..991ae221d10
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "Alcuni contenuti sono stati disabilitati in questo documento",
+	"preview.securityMessage.title": "Contenuti potenzialmente non sicuri sono stati disattivati nell'anteprima del Markdown. Modificare l'impostazione di protezione dell'anteprima del Markdown per consentire la visualizzazione di contenuto insicuro o abilitare gli script",
+	"preview.securityMessage.label": "Avviso di sicurezza contenuto disabilitato"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/security.i18n.json b/i18n/ita/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..17900416bd6
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Carica solo contenuto protetto",
+	"insecureContent.title": "Consenti contenuto non protetto",
+	"insecureContent.description": "Consente il caricamento di contenuti tramite HTTP",
+	"disable.title": "Disabilita",
+	"disable.description": "Consente l'esecuzione di tutti i contenuti e script. Scelta non consigliata",
+	"moreInfo.title": "Altre informazioni",
+	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
+	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
+	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
+	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/package.i18n.json b/i18n/ita/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..eeb708af9fa
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Funzionalità del linguaggio Markdown",
+	"description": "Fornisce un supporto avanzato del linguaggio per Markdown.",
+	"markdown.preview.breaks.desc": "Imposta come le interruzioni di riga vengono visualizzate nell'anteprima di markdown. Impostarlo a 'true' crea un <br>per ogni carattere di nuova riga.",
+	"markdown.preview.linkify": "Abilita o disabilita la conversione di testo simile a URL in collegamenti nell'anteprima markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Fare doppio clic nell'anteprima markdown per passare all'editor.",
+	"markdown.preview.fontFamily.desc": "Consente di controllare la famiglia di caratteri usata nell'anteprima markdown.",
+	"markdown.preview.fontSize.desc": "Consente di controllare le dimensioni del carattere in pixel usate nell'anteprima markdown.",
+	"markdown.preview.lineHeight.desc": "Consente di controllare l'altezza della riga usata nell'anteprima markdown. Questo numero è relativo alle dimensioni del carattere.",
+	"markdown.preview.markEditorSelection.desc": "Contrassegna la selezione dell'editor corrente nell'anteprima markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Quando si scorre l'anteprima markdown, aggiorna la visualizzazione dell'editor.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Quando si scorre l'editor markdown, aggiorna la visualizzazione dell'anteprima.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Deprecato] Scorre l'anteprima markdown in modo da visualizzare la riga attualmente selezionata dall'editor.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Questa impostazione è stata sostituita da 'markdown.preview.scrollPreviewWithEditor' e non ha più effetto.",
+	"markdown.preview.title": "Apri anteprima",
+	"markdown.previewFrontMatter.dec": "Consente di impostare il rendering del front matter YAML nell'anteprima markdown. Con 'hide' il front matter viene rimosso; altrimenti il front matter viene considerato come contenuto markdown.",
+	"markdown.previewSide.title": "Apri anteprima lateralmente",
+	"markdown.showLockedPreviewToSide.title": "Apri anteprima bloccata lateralmente",
+	"markdown.showSource.title": "Mostra origine",
+	"markdown.styles.dec": "Elenco di URL o percorsi locali dei fogli di stile CSS da usare dall'anteprima markdown. I percorsi relativi vengono interpretati come relativi alla cartella aperta nella finestra di esplorazione. Se non è presente alcuna cartella aperta, vengono interpretati come relativi al percorso del file markdown. Tutti i caratteri '\\' devono essere scritti come '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Modifica impostazioni di sicurezza anteprima",
+	"markdown.trace.desc": "Abilitare la registrazione debug per l'estensione markdown.",
+	"markdown.preview.refresh.title": "Aggiorna anteprima",
+	"markdown.preview.toggleLock.title": "Attiva/Disattiva blocco anteprima"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..7a30dfbedfe
--- /dev/null
+++ b/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "Consentire l'esecuzione di {0} (definito come impostazione dell'area di lavoro) per il lint dei file PHP?",
+	"php.yes": "Consenti",
+	"php.no": "Non consentire",
+	"wrongExecutable": "Non è possibile eseguire la convalida perché {0} non è un file eseguibile di PHP valido. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
+	"noExecutable": "Non è possibile eseguire la convalida perché non è impostato alcun file eseguibile di PHP. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
+	"unknownReason": "Non è stato possibile eseguire php con il percorso {0}. Il motivo è sconosciuto."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php-language-features/package.i18n.json b/i18n/ita/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..ea44ea91d9f
--- /dev/null
+++ b/i18n/ita/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Consente di configurare l'abilitazione dei suggerimenti predefiniti per il linguaggio PHP. Il supporto suggerisce variabili e variabili globali PHP.",
+	"configuration.validate.enable": "Abilita/Disabilita la convalida PHP predefinita.",
+	"configuration.validate.executablePath": "Punta all'eseguibile di PHP.",
+	"configuration.validate.run": "Indica se il linter viene eseguito durante il salvataggio o la digitazione.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Non consentire la convalida di PHP eseguibile (definito come impostazione dell'area di lavoro)"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php/package.i18n.json b/i18n/ita/extensions/php/package.i18n.json
index f2707697f23..59850c0a057 100644
--- a/i18n/ita/extensions/php/package.i18n.json
+++ b/i18n/ita/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Consente di configurare l'abilitazione dei suggerimenti predefiniti per il linguaggio PHP. Il supporto suggerisce variabili e variabili globali PHP.",
-	"configuration.validate.enable": "Abilita/Disabilita la convalida PHP predefinita.",
-	"configuration.validate.executablePath": "Punta all'eseguibile di PHP.",
-	"configuration.validate.run": "Indica se il linter viene eseguito durante il salvataggio o la digitazione.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Non consentire la convalida di PHP eseguibile (definito come impostazione dell'area di lavoro)",
-	"displayName": "Funzionalità del linguaggio PHP",
-	"description": "Offre IntelliSense, linting e nozioni di base sul linguaggio per i file PHP."
+	"displayName": "Funzionalità del linguaggio PHP"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 24c38320db5..2b9d73ba3f9 100644
--- a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "Non sono stati trovati risultati",
 	"settingsSearchIssue": "Problema di ricerca impostazioni",
 	"bugReporter": "Segnalazione bug",
-	"performanceIssue": "Problema di prestazioni",
 	"featureRequest": "Richiesta di funzionalità",
+	"performanceIssue": "Problema di prestazioni",
 	"stepsToReproduce": "Passi da riprodurre",
 	"bugDescription": "Indicare i passaggi necessari per riprodurre il problema in modo affidabile. Includere i risultati effettivi e quelli previsti. È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
 	"performanceIssueDesciption": "Quando si è verificato questo problema di prestazioni? All'avvio o dopo una serie specifiche di azioni? È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
diff --git a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
index d51e843ddbf..75512d966b7 100644
--- a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,6 @@
 	"warningBorder": "Colore del bordo degli squggle di avviso nell'editor.",
 	"infoForeground": "Colore primo piano degli squiggle di informazione nell'editor",
 	"infoBorder": "Colore del bordo degli squiggle di informazione nell'editor",
-	"overviewRulerRangeHighlight": "Colore del marcatore del righello delle annotazioni per le evidenziazioni degli intervalli.",
 	"overviewRuleError": "Colore del marcatore del righello delle annotazioni per gli errori.",
 	"overviewRuleWarning": "Colore del marcatore del righello delle annotazioni per gli avvisi.",
 	"overviewRuleInfo": "Colore del marcatore del righello delle annotazioni per i messaggi di tipo informativo."
diff --git a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 4a3430ffb99..a06753ebfa8 100644
--- a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Vai al problema successivo (Errore, Avviso, Informazioni)",
-	"markerAction.previous.label": "Vai al problema precedente (Errore, Avviso, Info)",
-	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
-	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
+	"markerAction.previous.label": "Vai al problema precedente (Errore, Avviso, Info)"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..a69e81d71e3
--- /dev/null
+++ b/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
+	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
+	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
+	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 0129c5330e3..1ce97a983c4 100644
--- a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,6 @@
 	"wordHighlightStrong": "Colore di sfondo di un simbolo durante l'accesso in scrittura, per esempio durante la scrittura di una variabile. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
 	"wordHighlightBorder": "Colore del bordo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile.",
 	"wordHighlightStrongBorder": "Colore del bordo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
-	"overviewRulerWordHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli.",
-	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura.",
 	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
 	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..6b01687be11
--- /dev/null
+++ b/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 altro file non visualizzato",
+	"moreFiles": "...{0} altri file non visualizzati"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..37c77254e7c
--- /dev/null
+++ b/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "Annulla"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 2dbb832ebf5..91d39114cd9 100644
--- a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,12 @@
 	"errorInstallingDependencies": "Errore durante l'installazione delle dipendenze. {0}",
 	"MarketPlaceDisabled": "Il Marketplace non è abilitato",
 	"removeError": "Errore durante la rimozione dell'estensione: {0}. Chiudere e riavviare VS Code prima di riprovare.",
-	"Not Market place extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
 	"notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.",
 	"malicious extension": "Non è possibile installare l'estensione poiché è stata segnalata come problematica.",
 	"notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.",
 	"quitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
 	"exitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
 	"uninstallDependeciesConfirmation": "Disinstallare solo '{0}' o anche le relative dipendenze?",
-	"uninstallOnly": "Solo",
-	"uninstallAll": "Tutto",
 	"uninstallConfirmation": "Disinstallare '{0}'?",
 	"ok": "OK",
 	"singleDependentError": "Non è possibile disinstallare l'estensione '{0}'. L'estensione '{1}' dipende da tale estensione.",
diff --git a/i18n/ita/src/vs/platform/markers/common/markers.i18n.json b/i18n/ita/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..f585e5046c6
--- /dev/null
+++ b/i18n/ita/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Errore",
+	"sev.warning": "Avviso",
+	"sev.info": "Informazioni"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
index 52b0e204cb5..2e5c4543ebf 100644
--- a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -92,7 +92,5 @@
 	"mergeBorder": "Colore bordo su intestazioni e sulla barra di divisione di conflitti di merge in linea.",
 	"overviewRulerCurrentContentForeground": "Colore primo piano righello panoramica attuale per i conflitti di merge in linea.",
 	"overviewRulerIncomingContentForeground": "Colore primo piano del righello panoramica modifiche in arrivo per i conflitti di merge in linea.",
-	"overviewRulerCommonContentForeground": "Colore primo piano righello panoramica dell'antenato comune per i conflitti di merge in linea.",
-	"overviewRulerFindMatchForeground": "Colore del marcatore del righello delle annotazioni per le corrispondenze della ricerca.",
-	"overviewRulerSelectionHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni delle selezioni."
+	"overviewRulerCommonContentForeground": "Colore primo piano righello panoramica dell'antenato comune per i conflitti di merge in linea."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index d3570a7296b..52332d26b60 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Sposta stato attivo sul gruppo successivo",
 	"openToSide": "Apri lateralmente",
 	"closeEditor": "Chiudi editor",
+	"closeOneEditor": "Chiudi",
 	"revertAndCloseActiveEditor": "Ripristina e chiudi editor",
 	"closeEditorsToTheLeft": "Chiudi editor a sinistra",
 	"closeAllEditors": "Chiudi tutti gli editor",
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 550f000183a..87ef247c949 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Chiudi",
 	"araLabelEditorActions": "Azioni editor"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
index c4f1db5d289..e548589e82c 100644
--- a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,8 +45,6 @@
 	"windowConfigurationTitle": "Finestra",
 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
 	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
-	"window.openFilesInNewWindow.default": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder (solo MacOS)",
-	"openFilesInNewWindow": "Controlla se i file devono essere aperti in una nuova finestra.\n- default: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder (solo MacOS)\n- on: i file verranno aperti in una nuova finestra\n- off: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
 	"window.openFoldersInNewWindow.on": "Le cartelle verranno aperte in una nuova finestra",
 	"window.openFoldersInNewWindow.off": "Le cartelle sostituiranno l'ultima finestra attiva",
 	"window.openFoldersInNewWindow.default": "Le cartelle verranno aperte in una nuova finestra a meno che non si selezioni una cartella dall'interno dell'applicazione, ad esempio tramite il menu File",
@@ -58,7 +56,6 @@
 	"restoreWindows": "Controlla la modalità di riapertura delle finestre dopo un riavvio. Selezionare 'none' per iniziare sempre con un'area di lavoro vuota, 'one' per riaprire l'ultima finestra usata,  'folders' per riaprire tutte le finestre con cartelle aperte oppure 'all' per riaprire tutte le finestre dell'ultima sessione.",
 	"restoreFullscreen": "Controlla se una finestra deve essere ripristinata a schermo intero se è stata chiusa in questa modalità.",
 	"zoomLevel": "Consente di modificare il livello di zoom della finestra. Il valore originale è 0 e ogni incremento superiore (ad esempio 1) o inferiore (ad esempio -1) rappresenta un aumento o una diminuzione del 20% della percentuale di zoom. È anche possibile immettere valori decimali per modificare il livello di zoom con maggiore granularità.",
-	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite in base al contesto:\n${activeEditorShort}: il nome del file (ad es. MyFile.txt)\n${activeEditorMedium}: il percorso del file relativo alla cartella dell'area di lavoro (ad es. myFolder/myFile.txt)\n${activeEditorLong}: il percorso completo del file (ad es. / Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)\n${folderPath}: percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)\n${rootName}: nome dell'area di lavoro (ad es. myFolder o myWorkspace)\n${rootPath}: percorso dell'area di lavoro (ad es. /Users/Development/myWorkspace)\n$(appName): ad esempio VS Code\n${dirty}: indica se l'editor attivo è in fase di modifica\n${separator}: un separatore condizionale (\" - \") che viene visualizzato solo quando circondato da variabili con valori",
 	"window.newWindowDimensions.default": "Apre nuove finestre al centro della schermata.",
 	"window.newWindowDimensions.inherit": "Apre nuove finestre le cui dimensioni sono uguali a quelle dell'ultima finestra attiva.",
 	"window.newWindowDimensions.maximized": "Apre nuove finestre ingrandite a schermo intero.",
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 3afac9d9582..7459163ddb4 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Riavvia frame",
 	"removeBreakpoint": "Rimuovi punto di interruzione",
 	"removeAllBreakpoints": "Rimuovi tutti i punti di interruzione",
-	"enableBreakpoint": "Abilita punto di interruzione",
-	"disableBreakpoint": "Disabilita punto di interruzione",
 	"enableAllBreakpoints": "Abilita tutti i punti di interruzione",
 	"disableAllBreakpoints": "Disabilita tutti i punti di interruzione",
 	"activateBreakpoints": "Attiva punti di interruzione",
 	"deactivateBreakpoints": "Disattiva punti di interruzione",
 	"reapplyAllBreakpoints": "Riapplica tutti i punti di interruzione",
 	"addFunctionBreakpoint": "Aggiungi punto di interruzione della funzione",
-	"addConditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
-	"editConditionalBreakpoint": "Modifica punto di interruzione...",
 	"setValue": "Imposta valore",
 	"addWatchExpression": "Aggiungi espressione",
 	"editWatchExpression": "Modifica espressione",
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..885d74b575b
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
+	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
+	"breakpointWidgetHitCountAriaLabel": "Il programma si arresterà in questo punto solo se viene raggiunto il numero di passaggi. Premere INVIO per accettare oppure ESC per annullare.",
+	"breakpointWidgetAriaLabel": "Il programma si arresterà in questo punto solo se la condizione è vera. Premere INVIO per accettare oppure ESC per annullare.",
+	"expression": "Espressione",
+	"hitCount": "Numero di passaggi"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index ce0f5ac7e16..171d99b96d1 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Modifica punto di interruzione...",
+	"disableBreakpoint": "Disabilita punto di interruzione",
+	"enableBreakpoint": "Abilita punto di interruzione",
 	"removeBreakpoints": "Rimuovi punti di interruzione",
 	"removeBreakpointOnColumn": "Rimuovi punto di interruzione a colonna {0}",
 	"removeLineBreakpoint": "Rimuovi punto di interruzione riga",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "Abilita punto di interruzione a colonna {0}",
 	"enableBreakpointOnLine": "Abilita punto di interruzione riga",
 	"addBreakpoint": "Aggiungi punto di interruzione",
+	"conditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
 	"addConfiguration": "Aggiungi configurazione..."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 1418cb86caf..05a9304ef54 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -28,7 +28,5 @@
 	"preLaunchTaskExitCode": "L'attività di preavvio '{0}' è stata terminata ed è stato restituito il codice di uscita {1}.",
 	"showErrors": "Mostra errori",
 	"noFolderWorkspaceDebugError": "Non è possibile eseguire il debug del file attivo. Assicurarsi che sia salvato su disco e che sia installata un'estensione di debug per tale tipo di file.",
-	"cancel": "Annulla",
-	"DebugTaskNotFound": "L'attività di preavvio '{0}' non è stata trovata.",
-	"taskNotTracked": "Non è possibile tenere traccia del preLaunchTask '{0}'."
+	"cancel": "Annulla"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..bf455524ce9
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,57 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Nome dell'estensione",
+	"extension id": "Identificatore dell'estensione",
+	"builtin": "Predefinita",
+	"publisher": "Nome dell'editore",
+	"install count": "Conteggio delle installazioni",
+	"rating": "Valutazione",
+	"license": "Licenza",
+	"details": "Dettagli",
+	"contributions": "Contributi",
+	"changelog": "Log delle modifiche",
+	"dependencies": "Dipendenze",
+	"noReadme": "File LEGGIMI non disponibile.",
+	"noChangelog": "Changelog non disponibile.",
+	"noContributions": "Nessun contributo",
+	"noDependencies": "Nessuna dipendenza",
+	"settings": "Impostazioni ({0})",
+	"setting name": "Nome",
+	"description": "Descrizione",
+	"default": "Impostazione predefinita",
+	"debuggers": "Debugger ({0})",
+	"debugger name": "Nome",
+	"debugger type": "Tipo",
+	"views": "Visualizzazioni ({0})",
+	"view id": "ID",
+	"view name": "Nome",
+	"view location": "Dove",
+	"localizations language id": "ID lingua",
+	"localizations language name": "Nome lingua",
+	"localizations localized language name": "Nome lingua (localizzato)",
+	"colorThemes": "Temi colore ({0})",
+	"iconThemes": "Temi icona ({0})",
+	"colorId": "ID",
+	"defaultDark": "Predefinito scuro",
+	"defaultLight": "Predefinito chiaro",
+	"defaultHC": "Predefinito contrasto elevato",
+	"JSON Validation": "Convalida JSON ({0})",
+	"fileMatch": "Corrispondenza file",
+	"schema": "Schema",
+	"commands": "Comandi ({0})",
+	"command name": "Nome",
+	"keyboard shortcuts": "Scelte rapide da tastiera",
+	"menuContexts": "Contesti menu",
+	"languages": "Linguaggi ({0})",
+	"language id": "ID",
+	"language name": "Nome",
+	"file extensions": "Estensioni di file",
+	"grammar": "Grammatica",
+	"snippets": "Frammenti"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 96e949cb24a..d9192794c71 100644
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "Consigliate",
 	"otherRecommendedExtensions": "Altri consigli",
 	"workspaceRecommendedExtensions": "Consigli per l'area di lavoro",
-	"builtInExtensions": "Predefinite",
 	"searchExtensions": "Cerca le estensioni nel Marketplace",
 	"sort by installs": "Ordina per: conteggio installazioni",
 	"sort by rating": "Ordina per: classificazione",
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 1dfea4391db..3939225c04f 100644
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,11 @@
 	"confirmMoveTrashMessageMultiple": "Sei sicuro di voler eliminarei seguenti {0} file?",
 	"confirmMoveTrashMessageFolder": "Eliminare '{0}' e il relativo contenuto?",
 	"confirmMoveTrashMessageFile": "Eliminare '{0}'?",
-	"undoBin": "È possibile ripristinare dal Cestino.",
-	"undoTrash": "È possibile ripristinare dal cestino.",
 	"doNotAskAgain": "Non chiedermelo di nuovo",
 	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
 	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
 	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
 	"irreversible": "Questa azione è irreversibile.",
-	"cancel": "Annulla",
-	"permDelete": "Elimina definitivamente",
 	"importFiles": "Importa file",
 	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
 	"replaceButtonLabel": "&&Sostituisci",
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..4d04454a2ac
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "Anteprima HTML"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..6ad886b279b
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "L'input dell'editor non è valido."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..2011975d153
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Sviluppatore"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..ee36d0bcec9
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Apri strumenti di sviluppo Webview",
+	"refreshWebviewLabel": "Ricarica Webview"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 3e7cf3f5df4..1677c2679d4 100644
--- a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "Sì",
+	"no": "No",
+	"doNotAskAgain": "Non chiedermelo di nuovo",
 	"JsonSchema.locale": "Linguaggio dell'interfaccia utente da usare.",
 	"vscode.extension.contributes.localizations": "Contribuisce traduzioni all'editor",
 	"vscode.extension.contributes.localizations.languageId": "Id della lingua in cui sono tradotte le stringhe visualizzate.",
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..cd233dbc352
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Copia"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..8c26d708058
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Totale {0} problemi",
+	"filteredProblems": "Mostrando {0} di {1} problemi"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..54af867231c
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.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."
+	],
+	"label": "Problemi",
+	"tooltip.N": "{0} problemi in questo file"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..8425fd2a247
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Visualizza",
+	"problems.view.toggle.label": "Attiva/Disattiva Problemi (Errori, Avvisi, Informazioni)",
+	"problems.view.focus.label": "Sposta lo stato attivo su problemi (Errori, Avvisi, Informazioni)",
+	"problems.panel.configuration.title": "Visualizzazione Problemi",
+	"problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura",
+	"markers.panel.title.problems": "Problemi",
+	"markers.panel.aria.label.problems.tree": "Problemi raggruppati per file",
+	"markers.panel.no.problems.build": "Finora non sono stati rilevati problemi nell'area di lavoro.",
+	"markers.panel.no.problems.filters": "Non sono stati trovati risultati corrispondenti ai criteri di filtro specificati",
+	"markers.panel.action.filter": "Filtra problemi",
+	"markers.panel.filter.placeholder": "Filtra per tipo o testo",
+	"markers.panel.filter.errors": "errori",
+	"markers.panel.filter.warnings": "avvisi",
+	"markers.panel.filter.infos": "messaggi informativi",
+	"markers.panel.single.error.label": "1 errore",
+	"markers.panel.multiple.errors.label": "{0} errori",
+	"markers.panel.single.warning.label": "1 avviso",
+	"markers.panel.multiple.warnings.label": "{0} avvisi",
+	"markers.panel.single.info.label": "1 messaggio informativo",
+	"markers.panel.multiple.infos.label": "{0} messaggi informativi",
+	"markers.panel.single.unknown.label": "1 sconosciuto",
+	"markers.panel.multiple.unknowns.label": "{0} sconosciuti",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} con {1} problemi",
+	"errors.warnings.show.label": "Mostra errori e avvisi"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index d4755072966..4fdc0d624d6 100644
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca successivi",
 	"previousSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca precedenti",
-	"nextSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca successivi",
-	"previousSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca precedenti",
 	"nextSearchTerm": "Mostra il termine di ricerca successivo",
 	"previousSearchTerm": "Mostra il termine di ricerca precedente",
 	"showSearchViewlet": "Mostra Cerca",
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
index e2aee106234..a0d921fec70 100644
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Attiva/Disattiva dettagli ricerca",
-	"searchScope.includes": "file da includere",
-	"label.includes": "Criteri di inclusione per la ricerca",
-	"searchScope.excludes": "file da escludere",
-	"label.excludes": "Criteri di esclusione per la ricerca",
 	"replaceAll.confirmation.title": "Sostituisci tutto",
 	"replaceAll.confirm.button": "&&Sostituisci",
 	"replaceAll.occurrence.file.message": "{0} occorrenza in {1} file è stata sostituita con '{2}'.",
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 8d36733b39a..d2e532ded80 100644
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "Non assegna l'attività ad alcun gruppo",
 	"JsonSchema.tasks.group": "Definisce il gruppo di esecuzione a cui appartiene questa attività. Supporta \"build\" per aggiungerlo al gruppo di compilazione e \"test\" per aggiungerlo al gruppo di test.",
 	"JsonSchema.tasks.type": "Definisce se l'attività viene eseguita come un processo o come un comando all'interno di una shell.",
+	"JsonSchema.command": "Comando da eseguire. Può essere un programma esterno o un comando della shell.",
+	"JsonSchema.tasks.args": "Argomenti passati al comando quando viene richiamata questa attività.",
 	"JsonSchema.tasks.label": "Etichetta dell'attività per l'interfaccia utente ",
 	"JsonSchema.version": "Numero di versione della configurazione",
 	"JsonSchema.tasks.identifier": "Identificatore definito dall'utente per fare riferimento all'attività in launch.json o in una clausola dependsOn.",
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index b2e3a492ebb..72ae41d5c50 100644
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,10 @@
 	],
 	"tasksCategory": "Attività",
 	"ConfigureTaskRunnerAction.label": "Configura attività",
-	"problems": "Problemi",
+	"totalErrors": "{0} errori",
+	"totalWarnings": "{0} avvisi",
+	"totalInfos": "{0} messaggi informativi",
 	"building": "Compilazione in corso...",
-	"manyMarkers": "Più di 99",
 	"runningTasks": "Visualizza attività in esecuzione",
 	"tasks": "Attività",
 	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività con un'attività attiva in esecuzione, è necessario ricaricare la finestra",
@@ -46,8 +47,8 @@
 	"recentlyUsed": "attività usate di recente",
 	"configured": "attività configurate",
 	"detected": "attività rilevate",
-	"TaskService.ignoredFolder": "Le cartelle dell'area di lavoro seguenti verranno ignorate perché usano la versione 0.1.0 delle attività: {0}",
 	"TaskService.notAgain": "Non visualizzare più questo messaggio",
+	"TaskService.ignoredFolder": "Le cartelle dell'area di lavoro seguenti verranno ignorate perché usano la versione 0.1.0 delle attività: {0}",
 	"TaskService.pickRunTask": "Selezionare l'attività da eseguire",
 	"TaslService.noEntryToRun": "Non è stata trovata alcuna attività da eseguire. Configurare le attività...",
 	"TaskService.fetchingBuildTasks": "Recupero delle attività di compilazione...",
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 5984bf9e6f1..5cf7f264969 100644
--- a/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Errore: nella configurazione di attività '{0}' manca la proprietà obbligatoria '{1}'. La configurazione dell'attività verrà ignorata.",
 	"ConfigurationParser.notCustom": "Errore: tasks non è dichiarato come un'attività personalizzata. La configurazione verrà ignorata.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Errore: un'attività deve specificare una proprietà label. L'attività verrà ignorata.\n{0}\n",
-	"taskConfiguration.shellArgs": "Avviso: l'attività '{0}' è un comando di shell e uno dei suoi argomenti potrebbe avere spazi indesiderati. Per garantire la correttezza della riga di comando unire args nel comando stesso.",
 	"taskConfiguration.noCommandOrDependsOn": "Errore: l'attività '{0}' non specifica un comando né una proprietà dependsOn. L'attività verrà ignorata. La sua definizione è:\n{1}",
 	"taskConfiguration.noCommand": "Errore: l'attività '{0}' non definisce un comando. L'attività verrà ignorata. Definizione dell'attività:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "L'attività versione 2.0.0 non supporta attività specifiche globali del sistema operativo. Convertirle in un'attività con un comando specifico del sistema operativo. Attività interessate:\n{0}"
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index e0033bb7d61..9e38fa8a7e0 100644
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copia",
+	"split": "Dividi",
 	"paste": "Incolla",
 	"selectAll": "Seleziona tutto",
-	"clear": "Cancella",
-	"split": "Dividi"
+	"clear": "Cancella"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..a720e18d093
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Note sulla versione: {0}",
+	"unassigned": "non assegnato"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index e675aaedcf6..f16acee2d3f 100644
--- a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "In seguito",
-	"unassigned": "non assegnato",
 	"releaseNotes": "Note sulla versione",
 	"showReleaseNotes": "Mostra note sulla versione",
 	"read the release notes": "Benvenuti in {0} versione {1}. Leggere le note sulla versione?",
diff --git a/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..6162c44dea8
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "editor Webview"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..184feafb8ac
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "Altre informazioni"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..bb1f14b4fcf
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Sì",
+	"cancelButton": "Annulla"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 1b3859ecb50..50a2d3795ee 100644
--- a/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,6 @@
 	"neverShowAgain": "Non visualizzare più questo messaggio",
 	"netVersionError": "Microsoft .NET Framework 4.5 è obbligatorio. Selezionare il collegamento per installarlo.",
 	"learnMore": "Istruzioni",
-	"enospcError": "{0} sta esaurendo gli handle di file. Per risolvere questo problema, seguire il collegamento alle istruzioni.",
 	"binFailed": "Non è stato possibile spostare '{0}' nel Cestino",
 	"trashFailed": "Non è stato possibile spostare '{0}' nel Cestino"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
index 6e9f57076de..e98cc6a8898 100644
--- a/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Risorsa del file non valida ({0})",
 	"fileIsDirectoryError": "Il File è una Directory",
 	"fileNotModifiedError": "File non modificato dal giorno",
-	"fileTooLargeForHeapError": "Le dimensioni del file superano il limite di memoria della finestra. Provare a eseguire il codice --max-memory=NEWSIZE",
 	"fileTooLargeError": "File troppo grande per essere aperto",
 	"fileNotFoundError": "Il file non è stato trovato ({0})",
 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
diff --git a/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..4fa1f89e7ff 100644
--- a/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Annulla"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..6d6b061cb73
--- /dev/null
+++ b/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "CSS 言語サーバー",
+	"folding.start": "折りたたみ領域の開始",
+	"folding.end": "折りたたみ領域の終了"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css-language-features/package.i18n.json b/i18n/jpn/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..f77f0b75a07
--- /dev/null
+++ b/i18n/jpn/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "CSS 言語機能",
+	"description": "CSS、LESS、SCSS ファイルに豊富な言語サポートを提供。",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
+	"css.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
+	"css.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
+	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
+	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
+	"css.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
+	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
+	"css.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
+	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
+	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
+	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
+	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
+	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
+	"css.lint.unknownProperties.desc": "不明なプロパティ。",
+	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
+	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
+	"css.lint.zeroUnits.desc": "0 に単位は必要ありません",
+	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
+	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
+	"css.validate.desc": "すべての検証を有効または無効にします",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
+	"less.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
+	"less.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
+	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
+	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
+	"less.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
+	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
+	"less.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
+	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
+	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
+	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
+	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
+	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
+	"less.lint.unknownProperties.desc": "不明なプロパティ。",
+	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
+	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
+	"less.lint.zeroUnits.desc": "0 に単位は必要ありません",
+	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
+	"less.validate.desc": "すべての検証を有効または無効にします",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
+	"scss.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
+	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
+	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
+	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
+	"scss.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
+	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
+	"scss.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
+	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
+	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
+	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
+	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
+	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
+	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
+	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
+	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
+	"scss.lint.zeroUnits.desc": "0 に単位は必要ありません",
+	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
+	"scss.validate.desc": "すべての検証を有効または無効にします",
+	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css/package.i18n.json b/i18n/jpn/extensions/css/package.i18n.json
index 920c3c933e8..afbe11a31b6 100644
--- a/i18n/jpn/extensions/css/package.i18n.json
+++ b/i18n/jpn/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS 言語機能",
-	"description": "CSS、LESS、SCSS ファイルに豊富な言語サポートを提供。",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
-	"css.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
-	"css.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
-	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"css.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"css.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
-	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"css.lint.unknownProperties.desc": "不明なプロパティ。",
-	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"css.lint.zeroUnits.desc": "0 に単位は必要ありません",
-	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
-	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
-	"css.validate.desc": "すべての検証を有効または無効にします",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-	"less.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-	"less.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"less.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"less.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"less.lint.unknownProperties.desc": "不明なプロパティ。",
-	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"less.lint.zeroUnits.desc": "0 の単位は必要ありません",
-	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
-	"less.validate.desc": "すべての検証を有効または無効にします",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-	"scss.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"scss.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"scss.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"scss.lint.zeroUnits.desc": "0 の単位は必要ありません",
-	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
-	"scss.validate.desc": "すべての検証を有効または無効にします",
-	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
+	"displayName": "CSS の基本言語サポート",
+	"description": "CSS、LESS、SCSS ファイル内で構文ハイライト、かっこ一致を提供します。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/emmet/package.i18n.json b/i18n/jpn/extensions/emmet/package.i18n.json
index b9dfede7063..6989669cdcb 100644
--- a/i18n/jpn/extensions/emmet/package.i18n.json
+++ b/i18n/jpn/extensions/emmet/package.i18n.json
@@ -59,5 +59,6 @@
 	"emmetPreferencesCssWebkitProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'webkit' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'webkit' プレフィックスを避ける場合は空の文字列に設定します。",
 	"emmetPreferencesCssMozProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'moz' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'moz' プレフィックスを避ける場合は空の文字列に設定します。",
 	"emmetPreferencesCssOProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'o' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'o' プレフィックスを避ける場合は空の文字列に設定します。",
-	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。"
+	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
+	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/commands.i18n.json b/i18n/jpn/extensions/git/out/commands.i18n.json
index 8b6874c3974..9b386d3755b 100644
--- a/i18n/jpn/extensions/git/out/commands.i18n.json
+++ b/i18n/jpn/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "タグが正常にプッシュされました。",
 	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
-	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
+	"sync is unpredictable": "このアクションはコミットを '{0}/{1}' との間でプッシュしたりプルしたりします。",
 	"never again": "OK、今後は表示しない",
 	"no remotes to publish": "リポジトリには、発行先として構成されているリモートがありません。",
 	"no changes stash": "スタッシュする変更がありません。",
diff --git a/i18n/jpn/extensions/git/package.i18n.json b/i18n/jpn/extensions/git/package.i18n.json
index ed4c2c13c62..5f3a79c4800 100644
--- a/i18n/jpn/extensions/git/package.i18n.json
+++ b/i18n/jpn/extensions/git/package.i18n.json
@@ -7,7 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"displayName": "Git",
-	"description": "Git SCM の統合",
+	"description": "Git SCM統合",
 	"command.clone": "クローン",
 	"command.init": "リポジトリの初期化",
 	"command.close": "リポジトリを閉じる",
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Git 変更の表示内にインラインのファイルを開くアクションを表示するかどうかを制御します。",
 	"config.inputValidation": "コミット メッセージの入力検証をいつ表示するかを制御します。",
 	"config.detectSubmodules": "Git のサブモジュールを自動的に検出するかどうかを制御します。",
+	"config.detectSubmodulesLimit": "Git サブモジュールの検出の制限を制御します。",
 	"colors.modified": "リソースを改変した場合の配色",
 	"colors.deleted": "リソースを検出した場合の配色",
 	"colors.untracked": "リソースを追跡しない場合の配色",
diff --git a/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..ed3272fd709
--- /dev/null
+++ b/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "HTML 言語サーバー",
+	"folding.start": "折りたたみ領域の開始",
+	"folding.end": "折りたたみ領域の終了"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html-language-features/package.i18n.json b/i18n/jpn/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..18b6e348d48
--- /dev/null
+++ b/i18n/jpn/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML 言語機能",
+	"description": "HTML、Razor、Handlebar ファイルに豊富な言語サポートを提供。",
+	"html.format.enable.desc": "既定の HTML フォーマッタを有効/無効にします",
+	"html.format.wrapLineLength.desc": "1 行あたりの最大文字数 (0 = 無効にする)。",
+	"html.format.unformatted.desc": "再フォーマットしてはならないタグの、コンマ区切りの一覧。'null' の場合、既定で https://www.w3.org/TR/html5/dom.html#phrasing-content にリストされているすべてのタグになります。",
+	"html.format.contentUnformatted.desc": "コンテンツを再フォーマットしてはならないタグをコンマで区切ってリストにします。'null' は、既定値の 'pre' タグを表します。",
+	"html.format.indentInnerHtml.desc": "<head> セクションと <body> セクションをインデントします。",
+	"html.format.preserveNewLines.desc": "要素の前にある既存の改行を保持するかどうか。要素の前でのみ機能し、タグの内側やテキストに対しては機能しません。",
+	"html.format.maxPreserveNewLines.desc": "1 つのチャンク内に保持できる改行の最大数。無制限にするには、'null' を使います。",
+	"html.format.indentHandlebars.desc": "書式設定とインデント {{#foo}} および {{/foo}}。",
+	"html.format.endWithNewline.desc": "末尾に改行を入れます。",
+	"html.format.extraLiners.desc": "直前に改行を 1 つ入れるタグの、コンマで区切られたリストです。'null' は、既定値の \"head, body, /html\" を表します。",
+	"html.format.wrapAttributes.desc": "属性を折り返します。",
+	"html.format.wrapAttributes.auto": "行の長さが超過した場合のみ属性を折り返します。",
+	"html.format.wrapAttributes.force": "先頭以外の各属性を折り返します。",
+	"html.format.wrapAttributes.forcealign": "先頭以外の各属性を折り返して位置を合わせます。",
+	"html.format.wrapAttributes.forcemultiline": "各属性を折り返します。",
+	"html.suggest.angular1.desc": "ビルトイン HTML 言語サポートが Angular V1 のタグおよびプロパティを候補表示するかどうかを構成します。",
+	"html.suggest.ionic.desc": "ビルトイン HTML 言語サポートが Ionic のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
+	"html.suggest.html5.desc": "ビルトイン HTML 言語サポートが HTML5 のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
+	"html.trace.server.desc": "VS Code と HTML 言語サーバー間の通信をトレースします。",
+	"html.validate.scripts": "ビルトイン HTML 言語サポートが埋め込みスクリプトを検証するかどうかを構成します。",
+	"html.validate.styles": "ビルトイン HTML 言語サポートが埋め込みスタイルを検証するかどうかを構成します。",
+	"html.autoClosingTags": "HTML タグの自動クローズを有効/無効にします。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html/package.i18n.json b/i18n/jpn/extensions/html/package.i18n.json
index 047a45d6e23..965c8b85db9 100644
--- a/i18n/jpn/extensions/html/package.i18n.json
+++ b/i18n/jpn/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML 言語機能",
-	"description": "HTML、Razor、Handlebar ファイルに豊富な言語サポートを提供。",
-	"html.format.enable.desc": "既定の HTML フォーマッタを有効/無効にします",
-	"html.format.wrapLineLength.desc": "1 行あたりの最大文字数 (0 = 無効にする)。",
-	"html.format.unformatted.desc": "再フォーマットしてはならないタグの、コンマ区切りの一覧。'null' の場合、既定で https://www.w3.org/TR/html5/dom.html#phrasing-content にリストされているすべてのタグになります。",
-	"html.format.contentUnformatted.desc": "コンテンツを再フォーマットしてはならないタグをコンマで区切ってリストにします。'null' は、既定値の 'pre' タグを表します。",
-	"html.format.indentInnerHtml.desc": "<head> セクションと <body> セクションをインデントします。",
-	"html.format.preserveNewLines.desc": "要素の前にある既存の改行を保持するかどうか。要素の前でのみ機能し、タグの内側やテキストに対しては機能しません。",
-	"html.format.maxPreserveNewLines.desc": "1 つのチャンク内に保持できる改行の最大数。無制限にするには、'null' を使います。",
-	"html.format.indentHandlebars.desc": "書式設定とインデント {{#foo}} および {{/foo}}。",
-	"html.format.endWithNewline.desc": "末尾に改行を入れます。",
-	"html.format.extraLiners.desc": "直前に改行を 1 つ入れるタグの、コンマで区切られたリストです。'null' は、既定値の \"head, body, /html\" を表します。",
-	"html.format.wrapAttributes.desc": "属性を折り返します。",
-	"html.format.wrapAttributes.auto": "行の長さが超過した場合のみ属性を折り返します。",
-	"html.format.wrapAttributes.force": "先頭以外の各属性を折り返します。",
-	"html.format.wrapAttributes.forcealign": "先頭以外の各属性を折り返して位置を合わせます。",
-	"html.format.wrapAttributes.forcemultiline": "各属性を折り返します。",
-	"html.suggest.angular1.desc": "ビルトイン HTML 言語サポートが Angular V1 のタグおよびプロパティを候補表示するかどうかを構成します。",
-	"html.suggest.ionic.desc": "ビルトイン HTML 言語サポートが Ionic のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-	"html.suggest.html5.desc": "ビルトイン HTML 言語サポートが HTML5 のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-	"html.trace.server.desc": "VS Code と HTML 言語サーバー間の通信をトレースします。",
-	"html.validate.scripts": "ビルトイン HTML 言語サポートが埋め込みスクリプトを検証するかどうかを構成します。",
-	"html.validate.styles": "ビルトイン HTML 言語サポートが埋め込みスタイルを検証するかどうかを構成します。",
-	"html.experimental.syntaxFolding": "構文の折りたたみマーカー認識を有効/無効にします。",
-	"html.autoClosingTags": "HTML タグの自動クローズを有効/無効にします。"
+	"displayName": "HTML の基本言語サポート",
+	"description": "HTML ファイル内で構文ハイライト、かっこ一致、スニペットを提供"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..2700229f8e7
--- /dev/null
+++ b/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "JSON 言語サーバー"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json-language-features/package.i18n.json b/i18n/jpn/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..2960f3fa69e
--- /dev/null
+++ b/i18n/jpn/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "JSON 言語機能",
+	"description": "JSON ファイルに豊富な言語サポートを提供。",
+	"json.schemas.desc": "スキーマを現在のプロジェクトの JSON ファイルに関連付けます",
+	"json.schemas.url.desc": "スキーマへの URL または現在のディレクトリのスキーマへの相対パス",
+	"json.schemas.fileMatch.desc": "JSON ファイルをスキーマに解決する場合に一致するファイル パターンの配列です。",
+	"json.schemas.fileMatch.item.desc": "JSON ファイルをスキーマに解決する場合に一致するよう '*' を含む可能性があるファイル パターンです。",
+	"json.schemas.schema.desc": "指定された URL のスキーマ定義です。スキーマは、スキーマ URL へのアクセスを避けるためにのみ指定する必要があります。",
+	"json.format.enable.desc": "既定の JSON フォーマッタを有効/無効にします (再起動が必要です)",
+	"json.tracing.desc": "VS Code と JSON 言語サーバー間の通信をトレースします。",
+	"json.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json/package.i18n.json b/i18n/jpn/extensions/json/package.i18n.json
index e060790f4dc..2ec4d67b799 100644
--- a/i18n/jpn/extensions/json/package.i18n.json
+++ b/i18n/jpn/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON 言語機能",
-	"description": "JSON ファイルに豊富な言語サポートを提供。",
-	"json.schemas.desc": "スキーマを現在のプロジェクトの JSON ファイルに関連付けます",
-	"json.schemas.url.desc": "スキーマへの URL または現在のディレクトリのスキーマへの相対パス",
-	"json.schemas.fileMatch.desc": "JSON ファイルをスキーマに解決する場合に一致するファイル パターンの配列です。",
-	"json.schemas.fileMatch.item.desc": "JSON ファイルをスキーマに解決する場合に一致するよう '*' を含む可能性があるファイル パターンです。",
-	"json.schemas.schema.desc": "指定された URL のスキーマ定義です。スキーマは、スキーマ URL へのアクセスを避けるためにのみ指定する必要があります。",
-	"json.format.enable.desc": "既定の JSON フォーマッタを有効/無効にします (再起動が必要です)",
-	"json.tracing.desc": "VS Code と JSON 言語サーバー間の通信をトレースします。",
-	"json.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"json.experimental.syntaxFolding": "構文の折りたたみマーカー認識を有効/無効にします。"
+	"displayName": "JSON の基本言語サポート",
+	"description": "JSON ファイル内で構文ハイライト、かっこ一致を提供"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..0489b0c3667
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles' を読み込むことができません: {0}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..21f810889f0
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[プレビュー] {0}",
+	"previewTitle": "プレビュー {0}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..8031d3c647d
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "このドキュメントで一部のコンテンツが無効になっています",
+	"preview.securityMessage.title": "安全でない可能性があるか保護されていないコンテンツは、マークダウン プレビューで無効化されています。保護されていないコンテンツやスクリプトを有効にするには、マークダウン プレビューのセキュリティ設定を変更してください",
+	"preview.securityMessage.label": "セキュリティが無効なコンテンツの警告"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..22ad7c7170c
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "高レベル",
+	"strict.description": "セキュリティで保護されたコンテンツのみを読み込む",
+	"insecureContent.title": "セキュリティで保護されていないコンテンツを許可する",
+	"insecureContent.description": "HTTP を介したコンテンツの読み込みを有効にする",
+	"disable.title": "無効にする",
+	"disable.description": "すべてのコンテンツとスクリプトの実行を許可します。推奨されません。",
+	"moreInfo.title": "詳細情報",
+	"enableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
+	"disableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
+	"toggleSecurityWarning.description": "コンテンツのセキュリティ レベルに影響しません",
+	"preview.showPreviewSecuritySelector.title": "ワークスペースのマークダウン プレビューに関するセキュリティ設定を選択 "
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/package.i18n.json b/i18n/jpn/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..58b68df0b74
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Markdown 言語機能",
+	"description": "Markdown に豊富な言語サポートを提供。",
+	"markdown.preview.breaks.desc": "マークダウン プレビューで改行をレンダリングする方法を設定します。'true' に設定すると改行ごとに <br> を作成します。",
+	"markdown.preview.linkify": "マークダウン プレビューで URL 形式のテキストからリンクへの変換を有効または無効にします。",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "マークダウンのプレビューでダブルクリックすると、エディターに切り替わります。",
+	"markdown.preview.fontFamily.desc": "マークダウン プレビューで使用されるフォント ファミリを制御します。",
+	"markdown.preview.fontSize.desc": "マークダウン プレビューで使用されるフォント サイズ (ピクセル単位) を制御します。",
+	"markdown.preview.lineHeight.desc": "マークダウン プレビューで使用される行の高さを制御します。この数値はフォント サイズを基準とします。",
+	"markdown.preview.markEditorSelection.desc": "マークダウンのプレビューに、エディターの現在の選択範囲を示すマークが付きます。",
+	"markdown.preview.scrollEditorWithPreview.desc": "マークダウンのプレビューをスクロールすると、エディターのビューが更新されます 。",
+	"markdown.preview.scrollPreviewWithEditor.desc": "マークダウンのエディターをスクロールすると、プレビューのビューが更新されます。",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[非推奨] エディターの現在選択されている行を表示するためにマークダウン プレビューをスクロールします。",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "この設定は 'markdown.preview.scrollPreviewWithEditor' に置き換えられ、もはや有効ではありません。",
+	"markdown.preview.title": "プレビューを開く",
+	"markdown.previewFrontMatter.dec": "マークダウン プレビューで YAML front matter がレンダリングされる方法を設定します。'hide' の場合、front matter が削除されます。その他の場合には、front matter はマークダウン コンテンツとして処理されます。",
+	"markdown.previewSide.title": "プレビューを横に表示",
+	"markdown.showLockedPreviewToSide.title": "ロックされたプレビューを横に表示",
+	"markdown.showSource.title": "ソースの表示",
+	"markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。",
+	"markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更",
+	"markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。",
+	"markdown.preview.refresh.title": "プレビューを更新",
+	"markdown.preview.toggleLock.title": "プレビュー ロックの切り替え"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..3f34bb85eac
--- /dev/null
+++ b/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "PHP ファイルを lint するために {0} (ワークスペースの設定として定義されている) を実行することを許可しますか?",
+	"php.yes": "許可",
+	"php.no": "許可しない",
+	"wrongExecutable": "{0} が有効な PHP 実行可能ファイルではないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
+	"noExecutable": "PHP 実行可能ファイルが設定されていないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
+	"unknownReason": "パス {0} を使用して php を実行できませんでした。理由は不明です。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php-language-features/package.i18n.json b/i18n/jpn/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..15a98a885de
--- /dev/null
+++ b/i18n/jpn/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
+	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
+	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
+	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。",
+	"displayName": "PHP 言語機能",
+	"description": "PHP ファイルに豊富な言語サポートを提供します。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php/package.i18n.json b/i18n/jpn/extensions/php/package.i18n.json
index c5c7d5d62ef..5989177b903 100644
--- a/i18n/jpn/extensions/php/package.i18n.json
+++ b/i18n/jpn/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
-	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
-	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
-	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。",
 	"displayName": "PHP 言語機能",
-	"description": "PHP ファイルの IntelliSense、リンティング、および基本言語サポートを提供します。"
+	"description": "PHP ファイル内に構文ハイライト、かっこ一致を提供します。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 2abf82cf890..17b19815820 100644
--- a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "一致する項目はありません",
 	"settingsSearchIssue": "設定検索の問題",
 	"bugReporter": "バグ レポート",
-	"performanceIssue": "パフォーマンスの問題",
 	"featureRequest": "機能欲求",
+	"performanceIssue": "パフォーマンスの問題",
 	"stepsToReproduce": "再現手順",
 	"bugDescription": "問題を再現するための正確な手順を共有します。このとき、期待する結果と実際の結果を提供してください。GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
 	"performanceIssueDesciption": "このパフォーマンスの問題はいつ発生しましたか? それは起動時ですか? それとも特定のアクションのあとですか? GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
diff --git a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
index 93732a981f0..764bb3ddb5f 100644
--- a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
@@ -57,7 +57,7 @@
 	"miPaste": "貼り付け(&&P)",
 	"miFind": "検索(&&F)",
 	"miReplace": "置換(&&R)",
-	"miFindInFiles": "ファイル内を検索(&&I)",
+	"miFindInFiles": "複数ファイルから検索(&&I)",
 	"miReplaceInFiles": "複数のファイルで置換(&&I)",
 	"miEmmetExpandAbbreviation": "Emmet: 略語の展開(&&X)",
 	"miShowEmmetCommands": "Emmet(&&M)...",
diff --git a/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
index be93b06c5a6..d5e55bf5dc9 100644
--- a/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,9 @@
 	"warningBorder": "エディターで警告を示す波線の境界線の色。",
 	"infoForeground": "エディターで情報を示す波線の前景色。",
 	"infoBorder": "エディターで情報を示す波線の境界線の色。",
-	"overviewRulerRangeHighlight": "範囲を強調表示するときの概要ルーラーのマーカー色。",
+	"hintForeground": "エディターでヒントを示す波線の前景色。",
+	"hintBorder": "エディターでヒントを示す波線の境界線の色。",
+	"overviewRulerRangeHighlight": "範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
 	"overviewRuleError": "エラーを示す概要ルーラーのマーカー色。",
 	"overviewRuleWarning": "警告を示す概要ルーラーのマーカー色。",
 	"overviewRuleInfo": "情報を示す概要ルーラーのマーカー色。"
diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 765d78bc6cf..3f023b18ed0 100644
--- a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "次の問題 (エラー、警告、情報) へ移動",
-	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動",
-	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
-	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
-	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
-	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
+	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..a523dd78325
--- /dev/null
+++ b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
+	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
+	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
+	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..7c0d7d8f473
--- /dev/null
+++ b/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"Sunday": "日曜日",
+	"Monday": "月曜日",
+	"Tuesday": "火曜日",
+	"Wednesday": "水曜日",
+	"Thursday": "木曜日",
+	"Friday": "金曜日",
+	"Saturday": "土曜日",
+	"SundayShort": "日",
+	"MondayShort": "月",
+	"TuesdayShort": "火",
+	"WednesdayShort": "水",
+	"ThursdayShort": "木",
+	"FridayShort": "金",
+	"SaturdayShort": "土",
+	"January": "1 月",
+	"February": "2 月",
+	"March": "3 月",
+	"April": "4 月",
+	"May": "5 月",
+	"June": "6 月",
+	"July": "7 月",
+	"August": "8 月",
+	"September": "9 月",
+	"October": "10 月",
+	"November": "11 月",
+	"December": "12 月",
+	"JanuaryShort": "1 月",
+	"FebruaryShort": "2 月",
+	"MarchShort": "3 月",
+	"AprilShort": "4 月",
+	"MayShort": "5 月",
+	"JuneShort": "6 月",
+	"JulyShort": "7 月",
+	"AugustShort": "8 月",
+	"SeptemberShort": "9 月",
+	"OctoberShort": "10 月",
+	"NovemberShort": "11 月",
+	"DecemberShort": "12 月"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index b0186480893..04ae521063b 100644
--- a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
 	"wordHighlightBorder": "変数の読み取りなど読み取りアクセス中のシンボルの境界線の色。",
 	"wordHighlightStrongBorder": "変数への書き込みなど書き込みアクセス中のシンボルの境界線の色。",
-	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。",
-	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。",
+	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
+	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
 	"wordHighlight.next.label": "次のシンボル ハイライトに移動",
 	"wordHighlight.previous.label": "前のシンボル ハイライトに移動"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..7921873c1f8
--- /dev/null
+++ b/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 つの追加ファイルが表示されていません",
+	"moreFiles": "...{0} 個の追加ファイルが表示されていません"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..c2ef06b51ea
--- /dev/null
+++ b/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "キャンセル"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index d9c8c1e7d10..9b0afc0667c 100644
--- a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "依存関係のインストール中にエラーが発生しました。{0}",
 	"MarketPlaceDisabled": "Marketplace が有効になっていません",
 	"removeError": "拡張機能の削除中にエラーが発生しました: {0}。もう一度やり直す前に、VS Code の終了と起動を実施してください。",
-	"Not Market place extension": "Marketplace の拡張機能のみ再インストールできます",
+	"Not a Marketplace extension": "Marketplace の拡張機能のみ再インストールできます",
 	"notFoundCompatible": "'{0}' をインストールできません。VS Code '{1}' と互換性がある利用可能なバージョンがありません。",
 	"malicious extension": "問題が報告されたので、拡張機能をインストールできません。",
 	"notFoundCompatibleDependency": "VS Code の現在のバージョン '{1}'  と互換性を持つ、依存関係がある拡張機能 '{0}' が見つからないため、インストールできません。",
 	"quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
 	"exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
 	"uninstallDependeciesConfirmation": "'{0}' のみをアンインストールしますか、または依存関係もアンインストールしますか?",
-	"uninstallOnly": "限定",
-	"uninstallAll": "すべて",
+	"uninstallOnly": "拡張機能のみ",
+	"uninstallAll": "すべてアンインストール",
 	"uninstallConfirmation": "'{0}' をアンインストールしてもよろしいですか?",
 	"ok": "OK",
 	"singleDependentError": "拡張機能 '{0}' をアンインストールできません。拡張機能 '{1}' がこの拡張機能に依存しています。",
diff --git a/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json b/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
index 92abbc3a7e9..b221fed5770 100644
--- a/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "マウスで複数の選択肢にツリーおよびリストの項目を追加するために使用される修飾子 (たとえば、エクスプローラーでエディターと scm ビューを開くなど)。`ctrlCmd` は、Windows と Linux では `Control` にマップされ、macOS では `Command` にマップされます。'横に並べて開く' マウス ジェスチャー (サポートされている場合) は、複数選択修飾子と競合しないように調整されます。",
 	"openMode.singleClick": "マウスのシングル クリックで項目を開きます。",
 	"openMode.doubleClick": "マウスのダブル クリックで項目を開きます。",
-	"openModeModifier": "マウスを使用して、ツリーとリストで項目を開く方法を制御します (サポートされている場合)。'SingleClick' に設定すると、項目をマウスのシングル クリックで開き、'doubleClick' に設定すると、ダブル クリックでのみ開きます。ツリーで子を持つ親の場合、この設定で、親をシングル クリックで展開するか、ダブル クリックで展開するかを制御します。該当しない場合、一部のツリーとリストでは、この設定が無視される場合があることに注意してください。"
+	"openModeModifier": "マウスを使用して、ツリーとリストで項目を開く方法を制御します (サポートされている場合)。'SingleClick' に設定すると、項目をマウスのシングル クリックで開き、'doubleClick' に設定すると、ダブル クリックでのみ開きます。ツリーで子を持つ親の場合、この設定で、親をシングル クリックで展開するか、ダブル クリックで展開するかを制御します。該当しない場合、一部のツリーとリストでは、この設定が無視される場合があることに注意してください。",
+	"horizontalScrolling setting": "ワークベンチでツリーが水平スクロールをサポートするかどうかを制御します。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json b/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..5842e6fd343
--- /dev/null
+++ b/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "エラー",
+	"sev.warning": "警告",
+	"sev.info": "情報"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
index 66a264ff6b9..9652da2b67e 100644
--- a/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "行内マージ競合の現在の概要ルーラー前景色。",
 	"overviewRulerIncomingContentForeground": "行内マージ競合の入力側の概要ルーラー前景色。",
 	"overviewRulerCommonContentForeground": "行内マージ競合の共通の祖先概要ルーラー前景色。",
-	"overviewRulerFindMatchForeground": "一致項目を示す概要ルーラーのマーカー色。",
-	"overviewRulerSelectionHighlightForeground": "選択対象を強調表示するときの概要ルーラーのマーカー色。"
+	"overviewRulerFindMatchForeground": "検索一致項目を示す概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
+	"overviewRulerSelectionHighlightForeground": "選択範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index d396a84c05a..68ec7e9afd8 100644
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "保存時のフォーマットは {0}ms 後に中止されました",
+	"timeout.onWillSave": "onWillSaveTextDocument-event は 1750ms 後に中止されました",
 	"saveParticipants": "Save Participants が実行中です..."
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..c56e83de881
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"extensionSource": "{0} (拡張機能)"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 658a3853560..9d31ab7234a 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "次のグループにフォーカス",
 	"openToSide": "横に並べて開く",
 	"closeEditor": "エディターを閉じる",
+	"closeOneEditor": "閉じる",
 	"revertAndCloseActiveEditor": "元に戻してエディターを閉じる",
 	"closeEditorsToTheLeft": "左側のエディターを閉じる",
 	"closeAllEditors": "すべてのエディターを閉じる",
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index ea110628335..8d15ea098f8 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "閉じる",
 	"araLabelEditorActions": "エディター操作"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 75172e53e1f..9cfb4721d40 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "新しい通知はありません",
 	"notifications": "通知",
 	"notificationsToolbar": "通知センターのアクション",
 	"notificationsList": "通知リスト"
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 3f7b9fa43c0..78f2e08e8dc 100644
--- a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "ウィンドウ",
 	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
 	"window.openFilesInNewWindow.off": "ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
-	"window.openFilesInNewWindow.default": "ファイルのフォルダーが開かれていたウィンドウでファイルを開くか、Dock または Finder を使用して開く場合以外は最後のアクティブ ウィンドウでファイルを開きます (macOS のみ)",
-	"openFilesInNewWindow": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: ファイルのフォルダーが開かれていたウィンドウでファイルを開くか、Dock または Finder を使用して開く場合以外は最後のアクティブ ウィンドウでファイルを開きます (macOS のみ\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
+	"window.openFilesInNewWindow.defaultMac": "Dock または Finder を使用して開いたときを除き、ファイルのフォルダーを開いているウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
+	"window.openFilesInNewWindow.default": "アプリケーション内から選択したとき (例: ファイル メニュー介したとき) を除き 、新しいウィンドウでファイルを開きます",
+	"openFilesInNewWindowMac": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: Dock または Finder を使用して開いたときを除き、ファイルのフォルダーを開いているウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーを開いているフォルダーまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (例: -new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
+	"openFilesInNewWindow": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: アプリケーション内から選択したとき (例: ファイル メニュー介したとき) を除き 、新しいウィンドウでファイルを開きます\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーを開いているフォルダーまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (例: -new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
 	"window.openFoldersInNewWindow.on": "新しいウィンドウでフォルダーを開きます",
 	"window.openFoldersInNewWindow.off": "フォルダーは、最後のアクティブ ウィンドウで開きます",
 	"window.openFoldersInNewWindow.default": "フォルダーがアプリケーション内から (たとえば、[ファイル] メニューから) 選択された場合を除いて、新しいウィンドウでフォルダーを開きます",
 	"openFoldersInNewWindow": "フォルダーを新しいウィンドウで開くか、最後のアクティブ ウィンドウで開くかを制御します。\n- default: アプリケーション内で ([ファイル] メニューなどから) 選択したものでなければ、新しいウィンドウでフォルダーを開く\n- on: 新しいウィンドウでフォルダーを開く\n- off: 最後のアクティブ ウィンドウでフォルダーを開く\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
+	"window.openWithoutArgumentsInNewWindow.on": "新しい空のウィンドウを開く",
+	"window.openWithoutArgumentsInNewWindow.off": "最後にアクティブだった実行中のインスタンスにフォーカスする",
+	"openWithoutArgumentsInNewWindow": "引数なしで 2 つ目のインスタンスを起動するとき、新しい空のウィンドウを開くか、最後に実行されていたウィンドウにフォーカスするかを制御します。\n- on: 新しい空のウィンドウを開く\n- off: 最後に実行されていたウィンドウにフォーカスする\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
 	"window.reopenFolders.all": "すべてのウィンドウを再度開きます。",
 	"window.reopenFolders.folders": "すべてのフォルダーを再度開きます。空のワークスペースは復元されません。",
 	"window.reopenFolders.one": "最後にアクティブだったウィンドウを再び開きます。",
@@ -58,7 +63,7 @@
 	"restoreWindows": "再起動後にワークスペースを再度開く方法を制御します。'none' を選択すると常に空のワークスペースで開始します。'one' を選択すると最後に使用したウィンドウを再度開きます。'folders' を選択すると開かれていたフォルダーとすべてのウィンドウを再度開きます。'all' を選択すると前回のセッションのすべてのウィンドウを再度開きます。",
 	"restoreFullscreen": "全画面表示モードで終了した場合に、ウィンドウを全画面表示モードに復元するかどうかを制御します。",
 	"zoomLevel": "ウィンドウのズーム レベルを調整します。元のサイズは 0 で、1 つ上げるごとに (1 など) 20% ずつ拡大することを表し、1 つ下げるごとに (-1 など) 20% ずつ縮小することを表します。小数点以下の桁数を入力して、さらに細かくズーム レベルを調整することもできます。",
-	"title": "アクティブなエディターに基づいてウィンドウのタイトルを制御します。変数は、コンテキストに基づいて置換されます:\n${activeEditorShort}: ファイル名 (例: myFile.txt)\n${activeEditorMedium}: ワークスペース フォルダーへの相対パス (例: myFolder/myFile.txt)\n${activeEditorLong}: ファイルの完全なパス (例: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: ファイルが含まれているワークスペース フォルダー名 (例: myFolder)\n${folderPath}: ァイルが含まれているワークスペース フォルダーのファイルパス (例: /Users/Development/myFolder)\n${rootName}: ワークスペースの名前 (例: myFolder や myWorkspace)\n${rootPath}: ワークスペースのファイル パス (例: /Users/Development/myWorkspace)\n${appName}: 例: VS Code\n${dirty}: アクティブなエディターがダーティである場合のダーティ インジゲーター\n${separator}: 値のある変数で囲まれた場合にのみ表示される条件付き区切り記号 (\" - \")",
+	"title": "アクティブなエディターに基づいてウィンドウのタイトルを制御します。変数は、コンテキストに基づいて置換されます:\n${activeEditorShort}: ファイル名 (例: myFile.txt)\n${activeEditorMedium}: ワークスペース フォルダーへの相対パス (例: myFolder/myFile.txt)\n${activeEditorLong}: ファイルの完全なパス (例: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: ファイルが含まれているワークスペース フォルダー名 (例: myFolder)\n${folderPath}: ァイルが含まれているワークスペース フォルダーのファイルパス (例: /Users/Development/myFolder)\n${rootName}: ワークスペースの名前 (例: myFolder や myWorkspace)\n${rootPath}: ワークスペースのファイル パス (例: /Users/Development/myWorkspace)\n${appName}: 例: VS Code\n${dirty}: アクティブなエディターがダーティである場合のダーティ インジゲーター\n${separator}: 値のある変数かスタティック テキストで囲まれた場合にのみ表示される条件付き区切り記号 (\" - \")",
 	"window.newWindowDimensions.default": "新しいウィンドウを画面の中央に開きます。",
 	"window.newWindowDimensions.inherit": "新しいウィンドウを、最後にアクティブだったウィンドウと同じサイズで開きます。",
 	"window.newWindowDimensions.maximized": "新しいウィンドウを最大化した状態で開きます。",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "有効にすると、Windows でハイ コントラスト テーマが使用されている場合にはハイ コントラスト テーマに自動的に変更され、Windows のハイ コントラスト テーマから切り替えられている場合にはダーク テーマに自動的に変更されます。",
 	"titleBarStyle": "ウィンドウのタイトル バーの外観を調整します。変更を適用するには、完全に再起動する必要があります。",
 	"window.nativeTabs": "macOS Sierra ウィンドウ タブを有効にします。この変更を適用するには完全な再起動が必要であり、ネイティブ タブでカスタムのタイトル バー スタイルが構成されていた場合はそれが無効になることに注意してください。",
+	"window.smoothScrollingWorkaround": "最小化した VS Code ウィンドウを元のサイズに戻したあと、スクロールが滑らかにならない場合はこの回避策を有効にしてください。これは Microsoft Surface のような高精度タッチパッドを備えたデバイスで、スクロールの開始が遅れる問題 (https://github.com/Microsoft/vscode/issues/13612) の回避策です。有効にすると、最小化の状態からウィンドウを元に戻したあとに少しレイアウトがちらつきますが、そうでなければ無害です。",
 	"zenModeConfigurationTitle": "Zen Mode",
 	"zenMode.fullScreen": "Zen Mode をオンにするとワークベンチを自動的に全画面モードに切り替えるかどうかを制御します。",
 	"zenMode.centerLayout": "Zen Mode をオンにしたときにレイアウトを中央揃えにするかどうかを制御します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 0d52dc72f30..2f23d0808e7 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "未確認のブレークポイント",
 	"functionBreakpointUnsupported": "このデバッグの種類では関数ブレークポイントはサポートされていません",
 	"breakpointDirtydHover": "未確認のブレークポイント。ファイルは変更されているので、デバッグ セッションを再起動してください。",
+	"logBreakpointUnsupported": "このデバッグの種類では、ログ ポイントはサポートされていません。",
 	"conditionalBreakpointUnsupported": "このデバッグの種類では、条件付きブレークポイントはサポートされていません。",
 	"hitBreakpointUnsupported": "このデバッグの種類では、ヒットした条件付きブレークポイントはサポートされていません。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 5a8bec4a4a4..f3b08e50093 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "フレームの再起動",
 	"removeBreakpoint": "ブレークポイントの削除",
 	"removeAllBreakpoints": "すべてのブレークポイントを削除する",
-	"enableBreakpoint": "ブレークポイントの有効化",
-	"disableBreakpoint": "ブレークポイントの無効化",
 	"enableAllBreakpoints": "すべてのブレークポイントを有効にする",
 	"disableAllBreakpoints": "すべてのブレークポイントを無効にする",
 	"activateBreakpoints": "ブレークポイントのアクティブ化",
 	"deactivateBreakpoints": "ブレークポイントの非アクティブ化",
 	"reapplyAllBreakpoints": "すべてのブレークポイントを再適用する",
 	"addFunctionBreakpoint": "関数ブレークポイントの追加",
-	"addConditionalBreakpoint": "条件付きブレークポイントの追加...",
-	"editConditionalBreakpoint": "ブレークポイントの編集...",
 	"setValue": "値の設定",
 	"addWatchExpression": "式の追加",
 	"editWatchExpression": "式の編集",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 6a9b071674e..f610bb7f3a1 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "デバッグ: ブレークポイントの切り替え",
 	"conditionalBreakpointEditorAction": "デバッグ: 条件付きブレークポイントの追加...",
+	"logPointEditorAction": "デバッグ: ログ ポイントの追加...",
 	"runToCursor": "カーソル行の前まで実行",
 	"debugEvaluate": "デバッグ: 評価",
 	"debugAddToWatch": "デバッグ: ウォッチに追加",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..e5f19bbddb1
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetLogMessagePlaceholder": "ブレークポイントにヒットしたときにログに記録するメッセージ。'Enter' で決定、 'esc' でキャンセルします。",
+	"breakpointWidgetHitCountPlaceholder": "ヒット カウント条件が満たされる場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
+	"breakpointWidgetExpressionPlaceholder": "式が true と評価される場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
+	"breakpointWidgetLogMessageAriaLabel": "このブレークポイントがヒットするたびにプログラムはこのメッセージを記録します。Enter を押して受け入れるか、Esc を押して取り消します。",
+	"breakpointWidgetHitCountAriaLabel": "ヒット カウントが満たされる場合にのみプログラムはこの位置で停止します。Enter を押して受け入れるか、Esc を押して取り消します。",
+	"breakpointWidgetAriaLabel": "この条件が true の場合にのみプログラムはこの位置で停止します。Enter を押して受け入れるか、Esc を押して取り消します。",
+	"expression": "式",
+	"hitCount": "ヒット カウント",
+	"logMessage": "ログ メッセージ"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index b72557e3925..ab14921810e 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "ブレークポイントの編集...",
+	"disableBreakpoint": "ブレークポイントの無効化",
+	"enableBreakpoint": "ブレークポイントの有効化",
 	"removeBreakpoints": "ブレークポイントの削除",
 	"removeBreakpointOnColumn": "列 {0} のブレークポイントの削除",
 	"removeLineBreakpoint": "行のブレークポイントの削除",
@@ -18,5 +21,7 @@
 	"enableBreakpoints": "列 {0} のブレークポイントの有効化",
 	"enableBreakpointOnLine": "行のブレークポイントの有効化",
 	"addBreakpoint": "ブレークポイントの追加",
+	"conditionalBreakpoint": "条件付きブレークポイントの追加...",
+	"addLogPoint": "ログ ポイントを追加...",
 	"addConfiguration": "構成の追加..."
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 252388aea65..94c8c8c8a16 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "エラーの表示",
 	"noFolderWorkspaceDebugError": "アクティブ ファイルをデバッグできません。ファイルがディスクに保存されており、そのファイル タイプのデバッグ拡張機能がインストールされていることを確認してください。",
 	"cancel": "キャンセル",
-	"DebugTaskNotFound": "preLaunchTask '{0}' が見つかりませんでした。",
-	"taskNotTracked": "preLaunchTask '{0}' を追跡できません。"
+	"DebugTaskNotFound": "タスク '{0}' を見つけられませんでした。",
+	"taskNotTracked": "タスク '{0}' を追跡できません。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index f065f55154a..d8917f641c3 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
@@ -18,6 +18,7 @@
 	"debugRequest": "構成の要求の種類。\"launch\" または \"attach\" です。",
 	"debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。",
 	"debugPrelaunchTask": "デバッグ セッションの開始前に実行するタスク。",
+	"debugPostDebugTask": "デバッグ セッションの終了後に実行するタスク。",
 	"debugWindowsConfiguration": "Windows 固有の起動構成の属性。",
 	"debugOSXConfiguration": "OS X 固有の起動構成の属性。",
 	"debugLinuxConfiguration": "Linux 固有の起動構成の属性。",
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 66b62080027..a123669adde 100644
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース フォルダー)",
 	"malicious tooltip": "この拡張機能は問題ありと報告されました。",
 	"malicious": "悪意がある",
+	"disabled": "無効",
+	"disabled globally": "無効",
+	"disabled workspace": "このワークスペースでは無効",
 	"disableAll": "インストール済みのすべての拡張機能を無効にする",
 	"disableAllWorkspace": "このワークスペースのインストール済みの拡張機能をすべて無効にする",
 	"enableAll": "すべての拡張機能を有効にする",
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..039a3a0e4af
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "拡張機能名",
+	"extension id": "拡張機能の識別子",
+	"preview": "プレビュー",
+	"builtin": "ビルトイン",
+	"publisher": "発行者名",
+	"install count": "インストール数",
+	"rating": "評価",
+	"repository": "リポジトリ",
+	"license": "ライセンス",
+	"details": "詳細",
+	"contributions": "コントリビューション",
+	"changelog": "変更ログ",
+	"dependencies": "依存関係",
+	"noReadme": "利用できる README はありません。",
+	"noChangelog": "使用可能な変更ログはありません。",
+	"noContributions": "コントリビューションはありません",
+	"noDependencies": "依存関係はありません",
+	"settings": "設定 ({0})",
+	"setting name": "名前",
+	"description": "説明",
+	"default": "既定",
+	"debuggers": "デバッガー ({0})",
+	"debugger name": "名前",
+	"debugger type": "種類",
+	"views": "ビュー ({0})",
+	"view id": "ID",
+	"view name": "名前",
+	"view location": "場所",
+	"localizations": "ローカライズ ({0})",
+	"localizations language id": "言語 ID",
+	"localizations language name": "言語名",
+	"localizations localized language name": "言語名 (ローカライズ済み)",
+	"colorThemes": "配色テーマ ({0})",
+	"iconThemes": "アイコン テーマ ({0})",
+	"colors": "配色 ({0})",
+	"colorId": "Id",
+	"defaultDark": "ダーク テーマの既定値",
+	"defaultLight": "ライト テーマの既定値",
+	"defaultHC": "ハイ コントラストの既定値",
+	"JSON Validation": "JSON 検証 ({0})",
+	"fileMatch": "対象ファイル",
+	"schema": "スキーマ",
+	"commands": "コマンド ({0})",
+	"command name": "名前",
+	"keyboard shortcuts": "キーボード ショートカット",
+	"menuContexts": "メニュー コンテキスト",
+	"languages": "言語 ({0})",
+	"language id": "ID",
+	"language name": "名前",
+	"file extensions": "ファイル拡張子",
+	"grammar": "文章校正",
+	"snippets": "スニペット"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index b1fa2a06853..bab69eb2957 100644
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "推奨",
 	"otherRecommendedExtensions": "その他の推奨事項",
 	"workspaceRecommendedExtensions": "ワークスペースの推奨事項",
-	"builtInExtensions": "ビルトイン",
+	"builtInExtensions": "機能",
+	"builtInThemesExtensions": "テーマ",
+	"builtInBasicsExtensions": "言語",
 	"searchExtensions": "Marketplace で拡張機能を検索する",
 	"sort by installs": "並べ替え: インストール数",
 	"sort by rating": "並べ替え: 評価",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index df5c875d8b5..75b84f17fd8 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "テキスト ファイル エディター",
 	"createFile": "ファイルの作成",
+	"relaunchWithIncreasedMemoryLimit": "再起動",
+	"configureMemoryLimit": "構成",
 	"fileEditorWithInputAriaLabel": "{0}。テキスト ファイル エディター。",
 	"fileEditorAriaLabel": "テキスト ファイル エディター。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 84ba2651ad8..128e5ec3d69 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -17,7 +17,7 @@
 	"createNewFile": "新しいファイル",
 	"createNewFolder": "新しいフォルダー",
 	"deleteButtonLabelRecycleBin": "ごみ箱に移動(&&M)",
-	"deleteButtonLabelTrash": "ゴミ箱に移動(&&M)",
+	"deleteButtonLabelTrash": "ごみ箱に移動(&&M)",
 	"deleteButtonLabel": "削除(&&D)",
 	"dirtyMessageFilesDelete": "保存されていない変更があるファイルを削除します。続行しますか?",
 	"dirtyMessageFolderOneDelete": "保存されていない変更がある 1 個のファイルを含むフォルダーを削除します。続行しますか?",
@@ -28,14 +28,16 @@
 	"confirmMoveTrashMessageFolder": "'{0}' とその内容を削除しますか?",
 	"confirmMoveTrashMessageFile": "'{0}' を削除しますか?",
 	"undoBin": "ごみ箱から復元できます。",
-	"undoTrash": "ゴミ箱から復元できます。",
+	"undoTrash": "ごみ箱から復元できます。",
 	"doNotAskAgain": "再度表示しない",
 	"confirmDeleteMessageMultiple": "次の {0} 個のファイルを完全に削除してもよろしいですか?",
 	"confirmDeleteMessageFolder": "'{0}' とその内容を完全に削除してもよろしいですか?",
 	"confirmDeleteMessageFile": "'{0}' を完全に削除してもよろしいですか?",
 	"irreversible": "このアクションは元に戻すことができません。",
-	"cancel": "キャンセル",
-	"permDelete": "完全に削除",
+	"binFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
+	"trashFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
+	"deletePermanentlyButtonLabel": "完全に削除(&&D)",
+	"retryButtonLabel": "再試行(&&R)",
 	"importFiles": "ファイルのインポート",
 	"confirmOverwrite": "保存先のフォルダーに同じ名前のファイルまたはフォルダーが既に存在します。置き換えてもよろしいですか?",
 	"replaceButtonLabel": "置換(&&R)",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 1e7ca7ba732..0f218645e33 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -35,8 +35,10 @@
 	"hotExit": "エディターを終了するときに保存を確認するダイアログを省略し、保存されていないファイルをセッション後も保持するかどうかを制御します。",
 	"useExperimentalFileWatcher": "新しい試験的な File Watcher を使用します。",
 	"defaultLanguage": "新しいファイルに割り当てられる既定の言語モード。",
+	"maxMemoryForLargeFilesMB": "大きなファイルを開くために再起動するときに、アプリケーションが使用する新しい MB 単位のメモリ制限。上限を再設定して起動する場合、 --max-memory=NEWSIZE をコマンド ラインで指定してアプリケーションを起動することもできます。",
 	"editorConfigurationTitle": "エディター",
 	"formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。",
+	"formatOnSaveTimeout": "保存時フォーマットのタイムアウトを制御します。formatOnSave-コマンドの時間制限をミリ秒単位で指定してください。指定したタイムアウトよりも時間がかかるコマンドはキャンセルされます。",
 	"explorerConfigurationTitle": "エクスプローラー",
 	"openEditorsVisible": "[開いているエディター] ウィンドウに表示するエディターの数。",
 	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index b087bed0bc3..bc26deafdbb 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -13,7 +13,9 @@
 	"dropFolder": "ワークスペースにフォルダーを追加しますか?",
 	"addFolders": "フォルダーの追加(&&A)",
 	"addFolder": "フォルダーの追加(&&A)",
+	"confirmRootsMove": "ワークスペース内の複数のルート フォルダーの順序が変更されますがよろしいですか?",
 	"confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?",
+	"confirmRootMove": "ワークスペース内のルート フォルダー '{0}' の順序が変更されますがよろしいですか?",
 	"confirmMove": "'{0}' を移動しますか?",
 	"doNotAskAgain": "再度表示しない",
 	"moveButtonLabel": "移動(&&M)",
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..47e72aa69e4
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "HTML プレビュー"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..d8a322eb85e
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "エディター入力が正しくありません。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..e619da1dc8b
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "開発者"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..14a4dc22123
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Webview 開発者ツールを開く",
+	"refreshWebviewLabel": "WebView の再読み込み"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index a1fa540c1c5..a9659f21937 100644
--- a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "VS Code の UI 言語を {0} にして再起動しますか?",
+	"yes": "はい",
+	"no": "いいえ",
+	"doNotAskAgain": "再度表示しない",
 	"JsonSchema.locale": "使用する UI 言語。",
 	"vscode.extension.contributes.localizations": "ローカリゼーションをエディターに提供します",
 	"vscode.extension.contributes.localizations.languageId": "表示文字列が翻訳される言語の id。",
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..d2939459ebd
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "コピー",
+	"copyMarkerMessage": "メッセージのコピー"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..4d411c1a062
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "合計 {0} 個の問題",
+	"filteredProblems": "{1} 個中 {0} 個の問題を表示しています"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..c361cf56e9a
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "問題",
+	"tooltip.1": "このファイルに 1 つの問題",
+	"tooltip.N": "このファイルに {0} 個の問題",
+	"markers.showOnFile": "ファイルとフォルダーにエラーと警告を表示します。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..67dcb1da19f
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,44 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "表示",
+	"problems.view.toggle.label": "問題  (エラー、警告、情報) の切り替え",
+	"problems.view.focus.label": "問題 (エラー、警告、情報) にフォーカス",
+	"problems.panel.configuration.title": "問題ビュー",
+	"problems.panel.configuration.autoreveal": "ファイルを開くときに問題ビューに自動的にそのファイルを表示するかどうかを制御します",
+	"markers.panel.title.problems": "問題",
+	"markers.panel.aria.label.problems.tree": "ファイル別にグループ化した問題",
+	"markers.panel.no.problems.build": "現時点でワークスペースの問題は検出されていません。",
+	"markers.panel.no.problems.filters": "指定されたフィルター条件による結果はありません",
+	"markers.panel.action.filter": "問題のフィルター処理",
+	"markers.panel.filter.placeholder": "種類またはテキストでフィルター処理",
+	"markers.panel.filter.errors": "エラー",
+	"markers.panel.filter.warnings": "警告",
+	"markers.panel.filter.infos": "情報",
+	"markers.panel.single.error.label": "エラー 1",
+	"markers.panel.multiple.errors.label": "エラー {0}",
+	"markers.panel.single.warning.label": "警告 1",
+	"markers.panel.multiple.warnings.label": "警告 {0}",
+	"markers.panel.single.info.label": "情報 1",
+	"markers.panel.multiple.infos.label": "情報 {0}",
+	"markers.panel.single.unknown.label": "不明 1",
+	"markers.panel.multiple.unknowns.label": "不明 {0}",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} (問題あり {1})",
+	"problems.tree.aria.label.marker.relatedInformation": "この問題は {0} 個の箇所へ参照を持っています。",
+	"problems.tree.aria.label.error.marker": "{0}: {1} によって生成されたエラー (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.error.marker.nosource": "エラー: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.warning.marker": "{0}: {1} によって生成された警告 (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.warning.marker.nosource": "警告: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.info.marker": "{0}: {1} によって生成された情報 (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.info.marker.nosource": "情報: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.marker": "{0} によって生成された問題: {1} (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.marker.nosource": "問題: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.relatedinfo.message": "{0} ({3} の行 {1}、文字 {2})",
+	"errors.warnings.show.label": "エラーと警告の表示"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 539e4feb174..e980f87baa4 100644
--- a/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "出力の切り替え",
 	"clearOutput": "出力のクリア",
 	"toggleOutputScrollLock": "出力スクロール ロックの切り替え",
-	"switchToOutput.label": "出力に切り替え"
+	"switchToOutput.label": "出力に切り替え",
+	"openInLogViewer": "ログ ファイルを開く"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 0cae9a24bb3..7ce6bdc9900 100644
--- a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "出力",
 	"logViewer": "ログ ビューアー",
 	"viewCategory": "表示",
-	"clearOutput.label": "出力のクリア"
+	"clearOutput.label": "出力のクリア",
+	"openActiveLogOutputFile": "表示: アクティブなログ出力ファイルを開く"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 1662eba1d89..15fc42aa021 100644
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -7,6 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"keybindingsInputName": "キーボード ショートカット",
+	"showDefaultKeybindings": "既定のキーバインドを表示",
+	"showUserKeybindings": "ユーザーのキーバインドを表示",
 	"SearchKeybindings.AriaLabel": "キー バインドの検索",
 	"SearchKeybindings.Placeholder": "キー バインドの検索",
 	"sortByPrecedene": "優先順位で並べ替え",
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 64ef0f72b82..2f468e9bae1 100644
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "次の検索包含パターンを表示",
 	"previousSearchIncludePattern": "前の検索包含パターンを表示",
-	"nextSearchExcludePattern": "次の検索除外パターンを表示",
-	"previousSearchExcludePattern": "前の検索除外パターンを表示",
 	"nextSearchTerm": "次の検索語句を表示",
 	"previousSearchTerm": "前の検索語句を表示",
 	"showSearchViewlet": "検索の表示",
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchView.i18n.json
index e3bc313f762..641a488aa05 100644
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,9 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "詳細検索の切り替え",
-	"searchScope.includes": "含めるファイル",
-	"label.includes": "検索包含パターン",
-	"searchScope.excludes": "除外するファイル",
-	"label.excludes": "検索除外パターン",
+	"searchIncludeExclude.label": "包含/除外するファイル",
+	"searchIncludeExclude.ariaLabel": "検索の包含/除外パターン",
+	"searchIncludeExclude.placeholder": "例: src, !*.ts, test/**/*.log",
 	"replaceAll.confirmation.title": "すべて置換",
 	"replaceAll.confirm.button": "置換(&&R)",
 	"replaceAll.occurrence.file.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index ed592ce8db9..c541ac646ed 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "問題パターン、あるいは提供されたか事前定義された問題パターンの名前。基本問題パターンが指定されている場合は省略できます。",
 	"ProblemMatcherSchema.base": "使用する基本問題マッチャーの名前。",
 	"ProblemMatcherSchema.owner": "Code 内の問題の所有者。base を指定すると省略できます。省略して base を指定しない場合、既定は 'external' になります。",
+	"ProblemMatcherSchema.source": "'typescript' または 'super lint' のような、この診断のソースを記述する解読可能な文字列",
 	"ProblemMatcherSchema.severity": "キャプチャされた問題の既定の重大度。パターンが重要度の一致グループを定義していない場合に使用されます。",
 	"ProblemMatcherSchema.applyTo": "テキスト ドキュメントで報告された問題が、開いているドキュメントのみ、閉じられたドキュメントのみ、すべてのドキュメントのいずれに適用されるかを制御します。",
 	"ProblemMatcherSchema.fileLocation": "問題パターンで報告されたファイル名を解釈する方法を定義します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index e7430be8b03..d81994154b1 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "タスクをグループに割り当てない",
 	"JsonSchema.tasks.group": "このタスクが属する実行グループを定義します。ビルド グループに追加する \"build\" とテスト グループに追加する \"test\" をサポートしています。",
 	"JsonSchema.tasks.type": "タスクをプロセスとして実行するか、またはシェル内部でコマンドとして実行するかどうかを定義します。",
+	"JsonSchema.command.quotedString.value": "実際のコマンド値",
+	"JsonSchema.tasks.quoting.escape": "シェルのエスケープ文字を使用して文字をエスケープします (例: PowerShell の ` 、bash の \\)。",
+	"JsonSchema.tasks.quoting.strong": "シェルの strong quote 文字を使用して引数を引用します (例: PowerShell や bash の下の \")。",
+	"JsonSchema.tasks.quoting.weak": "シェルの weak quote 文字を使用して引数を引用します (例: PowerShell や bash の下の ')。",
+	"JsonSchema.command.quotesString.quote": "どのようにコマンドの値を引用符で囲うかを制御します。",
+	"JsonSchema.command": "実行されるコマンド。外部プログラムかシェル コマンドです。",
+	"JsonSchema.args.quotedString.value": "実際の引数値",
+	"JsonSchema.args.quotesString.quote": "どのように引数の値を引用符で囲うかを制御します。",
+	"JsonSchema.tasks.args": "このタスクの起動時にコマンドに渡される引数。",
 	"JsonSchema.tasks.label": "タスクのユーザー インターフェイス ラベル",
 	"JsonSchema.version": "構成のバージョン番号",
 	"JsonSchema.tasks.identifier": "launch.json または dependsOn 句のタスクを参照するユーザー定義の識別子。",
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 27d7f12255e..df1f241a2c9 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,11 @@
 	],
 	"tasksCategory": "タスク",
 	"ConfigureTaskRunnerAction.label": "タスクの構成",
-	"problems": "問題",
+	"totalErrors": "エラー {0}",
+	"totalWarnings": "警告 {0}",
+	"totalInfos": "情報 {0}",
 	"building": "ビルド中...",
-	"manyMarkers": "99+",
+	"manyProblems": "10K+",
 	"runningTasks": "実行中のタスクを表示",
 	"tasks": "タスク",
 	"TaskSystem.noHotSwap": "アクティブなタスクを実行しているタスク実行エンジンを変更するには、ウィンドウの再読み込みが必要です",
@@ -46,8 +48,8 @@
 	"recentlyUsed": "最近使用したタスク",
 	"configured": "構成済みのタスク",
 	"detected": "検出されたタスク",
-	"TaskService.ignoredFolder": "次のワークスペース フォルダーはタスク バージョン 0.1.0 を使用しているため無視されます: {0}",
 	"TaskService.notAgain": "今後は表示しない",
+	"TaskService.ignoredFolder": "次のワークスペース フォルダーはタスク バージョン 0.1.0 を使用しているため無視されます: {0}",
 	"TaskService.pickRunTask": "実行するタスクを選択してください",
 	"TaslService.noEntryToRun": "実行するタスクがありません。タスクを構成する...",
 	"TaskService.fetchingBuildTasks": "ビルド タスクをフェッチしています...",
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index f540ee615ca..c7a264707a6 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "警告: options.cwd は、string 型でなければなりません。値 {0} を無視します",
+	"ConfigurationParser.inValidArg": "エラー: コマンド引数は文字列もしくは引用文字列のどちらかである必要があります。指定された値:\n{0}",
 	"ConfigurationParser.noargs": "エラー: コマンド引数は文字列の配列でなければなりません。指定された値:\n{0}",
 	"ConfigurationParser.noShell": "警告: シェル構成がサポートされるのは、ターミナルでタスクを実行している場合のみです。",
 	"ConfigurationParser.noName": "エラー: 宣言スコープ内の問題マッチャーに次の名前がなければなりません:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "エラー: タスク構成 '{0}' に必要な '{1}' プロパティがありません。構成は無視されます。 ",
 	"ConfigurationParser.notCustom": "エラー: タスクがカスタム タスクとして定義されていません。この構成は無視されます。\n{0}\n",
 	"ConfigurationParser.noTaskName": "エラー: タスクが label プロパティを提供しなければなりません。このタスクは無視されます。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: タスク '{0}' はシェル コマンドであり、その引数の 1 つにエスケープされていないスペースが含まれている可能性があります。コマンド ラインの引用が正しく解釈されるように、引数をコマンドにマージしてください。",
 	"taskConfiguration.noCommandOrDependsOn": "エラー: タスク '{0}' は、コマンドも dependsOn プロパティも指定していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
 	"taskConfiguration.noCommand": "エラー: タスク '{0}' はコマンドを定義していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "バージョン 2.0.0 のタスクでは、OS に固有のグローバル タスクはサポートされません。OS に固有のコマンドを使用したタスクに変換してください。影響を受けるタスクは次のとおりです。\n{0}"
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index de2f0795edc..332b26ef5fc 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
@@ -51,5 +51,9 @@
 	"workbench.action.terminal.hideFindWidget": "検索ウィジェットを非表示にする",
 	"nextTerminalFindTerm": "次の検索語句を表示",
 	"previousTerminalFindTerm": "前の検索語句を表示",
-	"quickOpenTerm": "アクティブなターミナルの切り替え"
+	"quickOpenTerm": "アクティブなターミナルの切り替え",
+	"workbench.action.terminal.focusPreviousCommand": "前のコマンドにフォーカス",
+	"workbench.action.terminal.focusNextCommand": "次のコマンドにフォーカス",
+	"workbench.action.terminal.selectToPreviousCommand": "前のコマンドを選択",
+	"workbench.action.terminal.selectToNextCommand": "次のコマンドを選択"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index ea4ba1b2cc4..ae2af92bf59 100644
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "コピー",
+	"split": "分割",
 	"paste": "貼り付け",
 	"selectAll": "すべて選択",
-	"clear": "クリア",
-	"split": "分割"
+	"clear": "クリア"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..8bfa1cc30f1
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "リリース ノート: {0}",
+	"unassigned": "未割り当て"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 07e679a1ed8..a45d01fca51 100644
--- a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "後で",
-	"unassigned": "未割り当て",
 	"releaseNotes": "リリース ノート",
 	"showReleaseNotes": "リリース ノートの表示",
 	"read the release notes": "{0} v{1} へようこそ! リリース ノートを確認しますか?",
diff --git a/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..01bd67d78ca
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "webview エディター"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..635368f9425
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.optOutNotice": "Microsoft による利用状況のデータ収集を許可することで VS Code の改善に役立てることができます。私たちの [プライバシーに関する声明]({0}) 参照し、[オプト アウト]({1}) する方法を確認してください。",
+	"telemetryOptOut.optInNotice": "Microsoft による利用状況のデータ収集を許可することで VS Code の改善に役立てることができます。私たちの [プライバシーに関する声明]({0}) 参照し、[オプト イン]({1}) する方法を確認してください。",
+	"telemetryOptOut.readMore": "詳細を参照"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..3f0c29658fc
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "マルチ フォルダー ワークスペースで ${workspaceFolder} を解決できません。この変数を : とフォルダー名を使用して範囲指定してください。",
+	"canNotResolveWorkspaceFolder": "${workspaceFolder} を解決できません。フォルダーを開いてください。",
+	"canNotResolveFolderBasenameMultiRoot": "マルチ フォルダー ワークスペースで ${workspaceFolderBasename} を解決できません。この変数を : とフォルダー名を使用してスコープしてください。",
+	"canNotResolveFolderBasename": "${workspaceFolderBasename} を解決できません。フォルダーを開いてください。",
+	"canNotResolveLineNumber": "${lineNumber} を解決できません。エディターを開いてください。",
+	"canNotResolveSelectedText": "${selectedText} を解決できません。エディターを開いてください。",
+	"canNotResolveFile": "${file} を解決できません。エディターを開いてください。",
+	"canNotResolveRelativeFile": "${relativeFile} を解決できません。エディターを開いてください。",
+	"canNotResolveFileDirname": "${fileDirname} を解決できません。エディターを開いてください。",
+	"canNotResolveFileExtname": "${fileExtname} を解決できません。エディターを開いてください。",
+	"canNotResolveFileBasename": "${fileBasename} を解決できません。エディターを開いてください。",
+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} を解決できません。エディターを開いてください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..d51266c5310
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "はい(&&Y)",
+	"cancelButton": "キャンセル"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index bf9d744746a..840a5a93e43 100644
--- a/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,7 @@
 	"neverShowAgain": "今後は表示しない",
 	"netVersionError": "Microsoft .NET Framework 4.5 が必要です。リンクに移動してインストールしてください。",
 	"learnMore": "説明書",
-	"enospcError": "{0} はファイル ハンドルを使い果たしています。この問題を解決するには、リンクの手順に従ってください。",
+	"enospcError": "{0} はこの大規模なワークスペース内のファイル変更を監視できません。この問題を解決するには、リンクの手順に従ってください。",
 	"binFailed": "'{0}' をごみ箱に移動できませんでした",
 	"trashFailed": "'{0}' をごみ箱に移動できませんでした"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
index e27a42f7132..15dc46337bb 100644
--- a/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,7 @@
 	"fileInvalidPath": "ファイルのリソース ({0}) が無効です",
 	"fileIsDirectoryError": "ファイルはディレクトリです",
 	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
-	"fileTooLargeForHeapError": "ファイル サイズがウィンドウのメモリ制限を超えました。code --max-memory=NEWSIZE をお試しください",
+	"fileTooLargeForHeapError": "ファイル サイズが既定のメモリ制限を超えています。より大きい制限値で再起動してください。現在の設定では {0}MB で再起動するよう構成されています",
 	"fileTooLargeError": "開くファイルが大きすぎます",
 	"fileNotFoundError": "ファイルが見つかりません ({0})",
 	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
diff --git a/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..0814f6f9f96 100644
--- a/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "キャンセル"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 43184408e5b..e2962bb3983 100644
--- a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "tmLanguage ファイルにより使用される TextMate スコープ名。",
 	"vscode.extension.contributes.grammars.path": "tmLanguage ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './syntaxes/' で始まります。",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "この文法に言語が埋め込まれている場合は、言語 ID に対するスコープ名のマップ。",
+	"vscode.extension.contributes.grammars.tokenTypes": "スコープ名のトークン タイプへの割当て。",
 	"vscode.extension.contributes.grammars.injectTo": "この文法が挿入される言語の範囲名の一覧。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index dc2fe3903e3..26bc6832aeb 100644
--- a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
 	"invalid.injectTo": "`contributes.{0}.injectTo` の値が無効です。言語の範囲名の配列である必要があります。指定された値: {1}",
 	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` の値が無効です。スコープ名から言語へのオブジェクト マップである必要があります。指定された値: {1}",
+	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` の値が無効です。オブジェクトはスコープ名からトークン タイプへ割り当てられている必要があります。指定された値: {1}",
 	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
 	"no-tm-grammar": "この言語に対して TM 文法は登録されていません。"
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..18013d8de41
--- /dev/null
+++ b/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "CSS 언어 서버",
+	"folding.start": "영역 접기 시작",
+	"folding.end": "접기 영역 끝"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css-language-features/package.i18n.json b/i18n/kor/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..43cc6cb4724
--- /dev/null
+++ b/i18n/kor/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "CSS 언어 기능",
+	"description": "CSS, LESS 및 SCSS 파일에 대한 다양한 언어 지원을 제공합니다.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
+	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
+	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
+	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
+	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
+	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
+	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
+	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
+	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
+	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
+	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
+	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
+	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
+	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
+	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
+	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
+	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
+	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
+	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
+	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
+	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
+	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
+	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
+	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
+	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
+	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
+	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
+	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
+	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
+	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
+	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
+	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
+	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
+	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
+	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
+	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
+	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
+	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"scss.title": "SCSS(Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
+	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
+	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
+	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
+	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
+	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
+	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
+	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
+	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
+	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
+	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
+	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
+	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
+	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
+	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
+	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
+	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
+	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css/package.i18n.json b/i18n/kor/extensions/css/package.i18n.json
index 43cc6cb4724..35229bd6699 100644
--- a/i18n/kor/extensions/css/package.i18n.json
+++ b/i18n/kor/extensions/css/package.i18n.json
@@ -5,77 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "CSS 언어 기능",
-	"description": "CSS, LESS 및 SCSS 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
-	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"scss.title": "SCSS(Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
+	]
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/commands.i18n.json b/i18n/kor/extensions/git/out/commands.i18n.json
index 69fccaefa9f..bc4b7753a32 100644
--- a/i18n/kor/extensions/git/out/commands.i18n.json
+++ b/i18n/kor/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "확인",
 	"push with tags success": "태그와 함께 푸시되었습니다.",
 	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
-	"sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.",
 	"never again": "다시 표시 안 함",
 	"no remotes to publish": "리포지토리에 게시하도록 구성된 원격이 없습니다.",
 	"no changes stash": "스태시할 변경 내용이 없습니다.",
diff --git a/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..d112b7520ae
--- /dev/null
+++ b/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "HTML 언어 서버",
+	"folding.start": "영역 접기 시작",
+	"folding.end": "접기 영역 끝"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html-language-features/package.i18n.json b/i18n/kor/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..064a37a9634
--- /dev/null
+++ b/i18n/kor/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML 언어 기능",
+	"description": "HTML, Razor 및 Handlebar 파일에 대한 다양한 언어 지원을 제공합니다.",
+	"html.format.enable.desc": "기본 HTML 포맷터를 사용하거나 사용하지 않습니다.",
+	"html.format.wrapLineLength.desc": "한 줄당 최대 문자 수입니다(0 = 사용 안 함).",
+	"html.format.unformatted.desc": "쉼표로 분리된 태그 목록으로, 서식을 다시 지정해서는 안 됩니다. https://www.w3.org/TR/html5/dom.html#phrasing-content에 나열된 모든 태그의 기본값은 'null'로 설정됩니다.",
+	"html.format.contentUnformatted.desc": "쉼표로 분리된 태그 목록으로, 콘텐츠의 서식을 다시 지정해서는 안 됩니다. 'pre' 태그의 기본값은 'null'로 설정됩니다.",
+	"html.format.indentInnerHtml.desc": "<head> 및 <body> 섹션을 들여쓰기합니다.",
+	"html.format.preserveNewLines.desc": "요소 앞에 있는 기존 줄 바꿈의 유지 여부입니다. 요소 앞에만 적용되며 태그 안이나 텍스트에는 적용되지 않습니다.",
+	"html.format.maxPreserveNewLines.desc": "청크 한 개에 유지할 수 있는 최대 줄 바꿈 수입니다. 무제한일 때는 'null'을 사용합니다.",
+	"html.format.indentHandlebars.desc": "{{#foo}} 및 {{/foo}}를 서식 지정하고 들여쓰기합니다.",
+	"html.format.endWithNewline.desc": "줄 바꿈으로 끝납니다.",
+	"html.format.extraLiners.desc": "쉼표로 분리된 태그 목록으로 앞에 줄 바꿈을 추가로 넣어야 합니다. \"head, body, /html\"의 기본값은 'null'로 설정됩니다.",
+	"html.format.wrapAttributes.desc": "특성을 래핑합니다.",
+	"html.format.wrapAttributes.auto": "줄 길이를 초과하는 경우에만 특성을 래핑합니다.",
+	"html.format.wrapAttributes.force": "첫 번째 특성을 제외한 각 특성을 래핑합니다.",
+	"html.format.wrapAttributes.forcealign": "첫 번째 특성을 제외한 각 특성을 래핑하고 정렬된 상태를 유지합니다.",
+	"html.format.wrapAttributes.forcemultiline": "각 특성을 래핑합니다.",
+	"html.suggest.angular1.desc": "기본 제공 HTML 언어 지원에서 Angular V1 태그 및 속성을 제안하는지 여부를 구성합니다.",
+	"html.suggest.ionic.desc": "기본 제공 HTML 언어 지원에서 Ionic 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
+	"html.suggest.html5.desc": "기본 제공 HTML 언어 지원에서 HTML5 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
+	"html.trace.server.desc": "VS Code와 HTML 언어 서버 간 통신을 추적합니다.",
+	"html.validate.scripts": "기본 제공 HTML 언어 지원에서 포함 스크립트의 유효성을 검사하는지 여부를 구성합니다.",
+	"html.validate.styles": "기본 제공 HTML 언어 지원에서 포함 스타일의 유효성을 검사하는지 여부를 구성합니다.",
+	"html.autoClosingTags": "HTML 태그의 자동 닫기를 사용하거나 사용하지 않습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html/package.i18n.json b/i18n/kor/extensions/html/package.i18n.json
index a71b4df8880..35229bd6699 100644
--- a/i18n/kor/extensions/html/package.i18n.json
+++ b/i18n/kor/extensions/html/package.i18n.json
@@ -5,30 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "HTML 언어 기능",
-	"description": "HTML, Razor 및 Handlebar 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"html.format.enable.desc": "기본 HTML 포맷터를 사용하거나 사용하지 않습니다.",
-	"html.format.wrapLineLength.desc": "한 줄당 최대 문자 수입니다(0 = 사용 안 함).",
-	"html.format.unformatted.desc": "쉼표로 분리된 태그 목록으로, 서식을 다시 지정해서는 안 됩니다. https://www.w3.org/TR/html5/dom.html#phrasing-content에 나열된 모든 태그의 기본값은 'null'로 설정됩니다.",
-	"html.format.contentUnformatted.desc": "쉼표로 분리된 태그 목록으로, 콘텐츠의 서식을 다시 지정해서는 안 됩니다. 'pre' 태그의 기본값은 'null'로 설정됩니다.",
-	"html.format.indentInnerHtml.desc": "<head> 및 <body> 섹션을 들여쓰기합니다.",
-	"html.format.preserveNewLines.desc": "요소 앞에 있는 기존 줄 바꿈의 유지 여부입니다. 요소 앞에만 적용되며 태그 안이나 텍스트에는 적용되지 않습니다.",
-	"html.format.maxPreserveNewLines.desc": "청크 한 개에 유지할 수 있는 최대 줄 바꿈 수입니다. 무제한일 때는 'null'을 사용합니다.",
-	"html.format.indentHandlebars.desc": "{{#foo}} 및 {{/foo}}를 서식 지정하고 들여쓰기합니다.",
-	"html.format.endWithNewline.desc": "줄 바꿈으로 끝납니다.",
-	"html.format.extraLiners.desc": "쉼표로 분리된 태그 목록으로 앞에 줄 바꿈을 추가로 넣어야 합니다. \"head, body, /html\"의 기본값은 'null'로 설정됩니다.",
-	"html.format.wrapAttributes.desc": "특성을 래핑합니다.",
-	"html.format.wrapAttributes.auto": "줄 길이를 초과하는 경우에만 특성을 래핑합니다.",
-	"html.format.wrapAttributes.force": "첫 번째 특성을 제외한 각 특성을 래핑합니다.",
-	"html.format.wrapAttributes.forcealign": "첫 번째 특성을 제외한 각 특성을 래핑하고 정렬된 상태를 유지합니다.",
-	"html.format.wrapAttributes.forcemultiline": "각 특성을 래핑합니다.",
-	"html.suggest.angular1.desc": "기본 제공 HTML 언어 지원에서 Angular V1 태그 및 속성을 제안하는지 여부를 구성합니다.",
-	"html.suggest.ionic.desc": "기본 제공 HTML 언어 지원에서 Ionic 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-	"html.suggest.html5.desc": "기본 제공 HTML 언어 지원에서 HTML5 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-	"html.trace.server.desc": "VS Code와 HTML 언어 서버 간 통신을 추적합니다.",
-	"html.validate.scripts": "기본 제공 HTML 언어 지원에서 포함 스크립트의 유효성을 검사하는지 여부를 구성합니다.",
-	"html.validate.styles": "기본 제공 HTML 언어 지원에서 포함 스타일의 유효성을 검사하는지 여부를 구성합니다.",
-	"html.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
-	"html.autoClosingTags": "HTML 태그의 자동 닫기를 사용하거나 사용하지 않습니다."
+	]
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/jake/package.i18n.json b/i18n/kor/extensions/jake/package.i18n.json
index 2dcfc03464b..f83be6fbb64 100644
--- a/i18n/kor/extensions/jake/package.i18n.json
+++ b/i18n/kor/extensions/jake/package.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"description": "VSCode에 Jake 기능을 추가할 확장입니다.",
 	"displayName": "VSCode에 대한 Jake 지원",
 	"jake.taskDefinition.type.description": "사용자 지정할 Jake 작업입니다.",
 	"jake.taskDefinition.file.description": "작업을 제공하는 Jake 파일이며 생략할 수 있습니다.",
diff --git a/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..115ea612718
--- /dev/null
+++ b/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "JSON 언어 서버"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json-language-features/package.i18n.json b/i18n/kor/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..1f6c4dd2f4a
--- /dev/null
+++ b/i18n/kor/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"description": "JSON 파일에 대한 다양한 언어 지원을 제공합니다.",
+	"json.schemas.desc": "현재 프로젝트에서 스키마를 JSON 파일에 연결",
+	"json.schemas.url.desc": "현재 디렉터리에 있는 스키마의 URL 또는 상대 경로",
+	"json.schemas.fileMatch.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 파일 패턴의 배열입니다.",
+	"json.schemas.fileMatch.item.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 '*'를 포함할 수 있는 파일 패턴입니다.",
+	"json.schemas.schema.desc": "지정된 URL에 대한 스키마 정의입니다. 스키마 URL에 대한 액세스 방지를 위해서만 스키마를 제공해야 합니다.",
+	"json.format.enable.desc": "기본 JSON 포맷터 사용/사용 안 함(다시 시작해야 함)",
+	"json.tracing.desc": "VS Code와 JSON 언어 서버 간 통신을 추적합니다.",
+	"json.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json/package.i18n.json b/i18n/kor/extensions/json/package.i18n.json
index 3adf4f967d1..35229bd6699 100644
--- a/i18n/kor/extensions/json/package.i18n.json
+++ b/i18n/kor/extensions/json/package.i18n.json
@@ -5,17 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "JSON 언어 기능",
-	"description": "JSON 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"json.schemas.desc": "현재 프로젝트에서 스키마를 JSON 파일에 연결",
-	"json.schemas.url.desc": "현재 디렉터리에 있는 스키마의 URL 또는 상대 경로",
-	"json.schemas.fileMatch.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 파일 패턴의 배열입니다.",
-	"json.schemas.fileMatch.item.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 '*'를 포함할 수 있는 파일 패턴입니다.",
-	"json.schemas.schema.desc": "지정된 URL에 대한 스키마 정의입니다. 스키마 URL에 대한 액세스 방지를 위해서만 스키마를 제공해야 합니다.",
-	"json.format.enable.desc": "기본 JSON 포맷터 사용/사용 안 함(다시 시작해야 함)",
-	"json.tracing.desc": "VS Code와 JSON 언어 서버 간 통신을 추적합니다.",
-	"json.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"json.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다."
+	]
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..84643755d0a
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles': {0}을 불러올 수 없음"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..1c1e1aed9de
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/features/preview.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."
+	],
+	"previewTitle": "미리 보기 {0}"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..01370fa604b
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "이 문서에서 일부 콘텐츠가 사용하지 않도록 설정되었습니다.",
+	"preview.securityMessage.title": "Markdown 미리 보기에서 잠재적으로 안전하지 않거나 보안되지 않은 콘텐츠가 사용하지 않도록 설정되어 있습니다. 이 콘텐츠나 스크립트를 허용하려면 Markdown 미리 보기 보안 설정을 변경하세요.",
+	"preview.securityMessage.label": "콘텐츠 사용할 수 없음 보안 경고"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/security.i18n.json b/i18n/kor/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..b7fd641e493
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "Strict",
+	"strict.description": "보안 콘텐츠만 로드",
+	"insecureContent.title": "안전하지 않은 콘텐츠 허용",
+	"insecureContent.description": "http를 통한 콘텐츠 로드 사용",
+	"disable.title": "사용 안 함",
+	"disable.description": "모든 콘텐츠 및 스크립트 실행을 허용합니다. 권장하지 않습니다.",
+	"moreInfo.title": "추가 정보",
+	"enableSecurityWarning.title": "이 작업 영역에서 미리 보기 보안 경고 사용",
+	"disableSecurityWarning.title": "이 작업 영역에서 미리보기 보안 경고 사용 안 함",
+	"toggleSecurityWarning.description": "콘텐츠 보안 수준에 영향을 주지 않습니다.",
+	"preview.showPreviewSecuritySelector.title": "이 작업 영역에 대해 Markdown 미리 보기의 보안 설정 선택"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/package.i18n.json b/i18n/kor/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..ae5e530af4c
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,30 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"description": "Markdown에 대한 다양한 언어 지원을 제공합니다.",
+	"markdown.preview.breaks.desc": "마크다운 미리 보기에서 줄바꿈 렌더링 방식을 설정합니다. 'true'로 설정하면 모든 행에 대해 <br>이(가) 생성됩니다.",
+	"markdown.preview.linkify": "Markdown 미리 보기에서 URL 같은 텍스트를 링크로 변환을 사용하거나 사용하지 않도록 설정합니다.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "markdown 미리 보기에서 두 번 클릭하여 편집기로 전환합니다.",
+	"markdown.preview.fontFamily.desc": "markdown 미리 보기에서 사용되는 글꼴 패밀리를 제어합니다.",
+	"markdown.preview.fontSize.desc": "markdown 미리 보기에서 사용되는 글꼴 크기(픽셀)를 제어합니다.",
+	"markdown.preview.lineHeight.desc": "markdown 미리 보기에 사용되는 줄 높이를 제어합니다. 이 숫자는 글꼴 크기에 상대적입니다.",
+	"markdown.preview.markEditorSelection.desc": "markdown 미리 보기에 현재 편집기 선택을 표시합니다.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Markdown 미리 보기를 스크롤할 때 편집기의 보기를 업데이트합니다.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown 편집기를 스크롤할 때 미리 보기의 보기를 업데이트합니다.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[사용되지 않음] markdown 미리 보기를 스크롤하여 편집기에서 현재 선택한 줄을 표시합니다.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "이 설정은 'markdown.preview.scrollPreviewWithEditor'로 대체되었으며 더 이상 영향을 주지 않습니다.",
+	"markdown.preview.title": "미리 보기 열기",
+	"markdown.previewFrontMatter.dec": "markdown 미리 보기에서 YAML 전문을 렌더링할 방법을 설정합니다. '숨기기' 기능을 사용하면 전문이 제거되고, 그러지 않으면 전문이 markdown 콘텐츠로 처리됩니다.",
+	"markdown.previewSide.title": "측면에서 미리 보기 열기",
+	"markdown.showLockedPreviewToSide.title": "측면에서 잠긴 미리 보기 열기",
+	"markdown.showSource.title": "소스 표시",
+	"markdown.styles.dec": "markdown 미리 보기에서 사용할 CSS 스타일시트의 URL 또는 로컬 경로 목록입니다. 상대 경로는 탐색기에서 열린 폴더를 기준으로 해석됩니다. 열린 폴더가 없으면 markdown 파일의 위치를 기준으로 해석됩니다. 모든 '\\'는 '\\\\'로 써야 합니다.",
+	"markdown.showPreviewSecuritySelector.title": "미리 보기 보안 설정 변경",
+	"markdown.trace.desc": "Markdown 확장에 대해 디버그 로깅을 사용하도록 설정합니다.",
+	"markdown.preview.toggleLock.title": "미리 보기 잠금 설정/해제"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..e88d0e75520
--- /dev/null
+++ b/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "PHP 파일을 lint하기 위해 {0}(작업 영역 설정으로 정의됨)의 실행을 허용하시겠습니까?",
+	"php.yes": "허용",
+	"php.no": "허용 안 함",
+	"wrongExecutable": "{0}은(는) 유효한 PHP 실행 파일이 아니기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
+	"noExecutable": "PHP 실행 파일이 설정되지 않았기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
+	"unknownReason": "{0} 경로를 사용하여 php를 실행하지 못했습니다. 이유를 알 수 없습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php-language-features/package.i18n.json b/i18n/kor/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..462c5348bcc
--- /dev/null
+++ b/i18n/kor/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "기본 제공 PHP 언어 제안을 사용하는지 여부를 구성합니다. 지원에서는 PHP 전역 및 변수를 제안합니다.",
+	"configuration.validate.enable": "기본 제공 PHP 유효성 검사를 사용하거나 사용하지 않습니다.",
+	"configuration.validate.executablePath": "PHP 실행 파일을 가리킵니다.",
+	"configuration.validate.run": "저장 시 또는 입력 시 Linter의 실행 여부입니다.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP 유효성 검사 실행 파일을 허용하지 않음(작업\n 영역 설정으로 정의됨)",
+	"displayName": "PHP 언어 기능",
+	"description": "PHP 파일에 대한 다양한 언어 지원을 제공합니다. "
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php/package.i18n.json b/i18n/kor/extensions/php/package.i18n.json
index c12a9f13cf2..a55af556ea0 100644
--- a/i18n/kor/extensions/php/package.i18n.json
+++ b/i18n/kor/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "기본 제공 PHP 언어 제안을 사용하는지 여부를 구성합니다. 지원에서는 PHP 전역 및 변수를 제안합니다.",
-	"configuration.validate.enable": "기본 제공 PHP 유효성 검사를 사용하거나 사용하지 않습니다.",
-	"configuration.validate.executablePath": "PHP 실행 파일을 가리킵니다.",
-	"configuration.validate.run": "저장 시 또는 입력 시 Linter의 실행 여부입니다.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP 유효성 검사 실행 파일을 허용하지 않음(작업\n 영역 설정으로 정의됨)",
-	"displayName": "PHP 언어 기능",
-	"description": "PHP 파일에 대해 IntelliSense, lint 및 언어 기본을 제공합니다."
+	"displayName": "PHP 언어 기능"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index f09203d420b..9bcb11a8721 100644
--- a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "결과 없음",
 	"settingsSearchIssue": "설정 검색 문제",
 	"bugReporter": "버그 보고서",
-	"performanceIssue": "성능 문제",
 	"featureRequest": "기능 요청",
+	"performanceIssue": "성능 문제",
 	"stepsToReproduce": "재현 단계",
 	"bugDescription": "문제를 안정적으로 재현시킬 수 있는 방법을 공유해주세요. 실제 결과와 예상 결과를 포함하세요. GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
 	"performanceIssueDesciption": "이 성능 문제가 언제 발생합니까? 시작할 때 발생합니까? 특정 작업을 진행한 이후에 발생합니까? GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
diff --git a/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 37b49551575..b02180c6602 100644
--- a/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,6 @@
 	"warningBorder": "편집기 내 경고 표시선의 테두리 색입니다.",
 	"infoForeground": "편집기 내 정보 표시선의 전경색입니다.",
 	"infoBorder": "편집기 내 정보 표시선의 테두리 색입니다.",
-	"overviewRulerRangeHighlight": "범위 강조 표시의 개요 눈금자 마커 색입니다.",
 	"overviewRuleError": "오류의 개요 눈금자 마커 색입니다.",
 	"overviewRuleWarning": "경고의 개요 눈금자 마커 색입니다.",
 	"overviewRuleInfo": "정보의 개요 눈금자 마커 색입니다."
diff --git a/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 96b96049dd7..bdb84052201 100644
--- a/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "다음 문제로 이동 (오류, 경고, 정보)",
-	"markerAction.previous.label": "이전 문제로 이동 (오류, 경고, 정보)",
-	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
-	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
-	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
-	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
+	"markerAction.previous.label": "이전 문제로 이동 (오류, 경고, 정보)"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..ff17e99717f
--- /dev/null
+++ b/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
+	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
+	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
+	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 509c0378067..296e9aa25b5 100644
--- a/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,6 @@
 	"wordHighlightStrong": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 배경색입니다. 색상은 밑에 깔린 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
 	"wordHighlightBorder": "변수 읽기와 같은 읽기 액세스 중 기호의 테두리 색입니다.",
 	"wordHighlightStrongBorder": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 테두리 색입니다.",
-	"overviewRulerWordHighlightForeground": "기호 강조 표시의 개요 눈금자 마커 색입니다.",
-	"overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다.",
 	"wordHighlight.next.label": "다음 강조 기호로 이동",
 	"wordHighlight.previous.label": "이전 강조 기호로 이동"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..e770ddd1642
--- /dev/null
+++ b/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1개의 추가 파일이 표시되지 않음",
+	"moreFiles": "...{0}개의 추가 파일이 표시되지 않음"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..a32e01e761e
--- /dev/null
+++ b/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "취소"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 76ee8e87f46..deafbdf4de7 100644
--- a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,12 @@
 	"errorInstallingDependencies": "의존성 설치 중 오류가 발생했습니다. {0}",
 	"MarketPlaceDisabled": "Marketplace를 사용할 수 없습니다.",
 	"removeError": "확장을 제거하는 동안 오류가 발생했습니다. {0}. 다시 시도하기 전에 VS Code를 종료하고 다시 시작하세요.",
-	"Not Market place extension": "마켓플레이스 확장만 다시 설치할 수 있습니다.",
 	"notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.",
 	"malicious extension": "문제가 있다고 보고되었으므로 확장을 설치할 수 없습니다.",
 	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
 	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
 	"exitCode": "확장을 설치할 수 없습니다. 다시 설치하기 전에 VS 코드를 종료한 후 다시 시작하십시오. ",
 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
-	"uninstallOnly": "만",
-	"uninstallAll": "모두",
 	"uninstallConfirmation": "'{0}'을(를) 제거할까요?",
 	"ok": "확인",
 	"singleDependentError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}'이(가) 이 확장에 종속됩니다.",
diff --git a/i18n/kor/src/vs/platform/markers/common/markers.i18n.json b/i18n/kor/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..d0a8772dd00
--- /dev/null
+++ b/i18n/kor/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "오류",
+	"sev.warning": "경고",
+	"sev.info": "정보"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
index fb0ab90f546..0a927c21be7 100644
--- a/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -92,7 +92,5 @@
 	"mergeBorder": "인라인 병합 충돌에서 헤더 및 스플리터의 테두리 색입니다.",
 	"overviewRulerCurrentContentForeground": "인라인 병합 충돌에서 현재 개요 눈금 전경색입니다.",
 	"overviewRulerIncomingContentForeground": "인라인 병합 충돌에서 수신 개요 눈금 전경색입니다.",
-	"overviewRulerCommonContentForeground": "인라인 병합 충돌에서 공통 과거 개요 눈금 전경색입니다.",
-	"overviewRulerFindMatchForeground": "찾기 일치 항목의 개요 눈금자 마커 색입니다.",
-	"overviewRulerSelectionHighlightForeground": "선택 영역 강조 표시의 개요 눈금자 마커 색입니다."
+	"overviewRulerCommonContentForeground": "인라인 병합 충돌에서 공통 과거 개요 눈금 전경색입니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 52020df2eb3..c3a38e203dc 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "다음 그룹에 포커스",
 	"openToSide": "측면에서 열기",
 	"closeEditor": "편집기 닫기",
+	"closeOneEditor": "닫기",
 	"revertAndCloseActiveEditor": "편집기 되돌리기 및 닫기",
 	"closeEditorsToTheLeft": "왼쪽에 있는 편집기 닫기",
 	"closeAllEditors": "모든 편집기 닫기",
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index e8aa35ae8a0..2acca1606b7 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "닫기",
 	"araLabelEditorActions": "편집기 작업"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 451b959a9ea..30e974a33fc 100644
--- a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,8 +45,6 @@
 	"windowConfigurationTitle": "창",
 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
 	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
-	"window.openFilesInNewWindow.default": "Dock 또는 Finder(macOS 전용)를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-	"openFilesInNewWindow": "파일을 새 창에서 열지 여부를 제어합니다.\n- default: Dock 또는 Finder(macOS 전용)를 통해 파일을 연 경우를 제외하고, 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n- on: 파일이 새 창에서 열립니다.\n- off: 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 -reuse-window 명령줄 옵션을 사용할 경우).",
 	"window.openFoldersInNewWindow.on": "폴더가 새 창에서 열립니다.",
 	"window.openFoldersInNewWindow.off": "폴더가 마지막 활성 창을 바꿉니다.",
 	"window.openFoldersInNewWindow.default": "폴더를 응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 폴더가 새 창에서 열립니다.",
@@ -58,7 +56,6 @@
 	"restoreWindows": "다시 시작한 이후에 창을 다시 여는 방법을 설정합니다. 'none'을 선택하면 항상 빈 작업 영역으로 시작하고 'one'을 선택하면 마지막으로 작업한 창이 다시 열리고 'folders'를 선택하면 열었던 폴더가 포함된 모든 창이 다시 열리며 'all'을 선택하면 지난 세션의 모든 창이 다시 열립니다.",
 	"restoreFullscreen": "창이 전체 화면 모드에서 종료된 경우 창을 전체 화면 모드로 복원할지 여부를 제어합니다.",
 	"zoomLevel": "창의 확대/축소 수준을 조정합니다. 원래 크기는 0이고 각 상한 증분(예: 1) 또는 하한 증분(예: -1)은 20% 더 크거나 더 작게 확대/축소하는 것을 나타냅니다. 10진수를 입력하여 확대/축소 수준을 세부적으로 조정할 수도 있습니다.",
-	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기반으로 대체됩니다.\n${activeEditorShort}: 파일 이름(예: myFile.txt)\n${activeEditorMedium}: 작업 영역 폴더에 상대적인 파일 경로(예: myFolder/myFile.txt)\n${activeEditorLong}: 파일 전체 경로(예: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 파일이 포함된 작업 영역 폴더 이름(예: myFolder)\n${folderPath}: 파일이 포함된 작업 영역 폴더의 파일 경로(예: /Users/Development/myFolder)\n${rootName}: 작업 영역 이름(예: myFolder 또는 myWorkspace)\n${rootPath}: 작업 영역 파일 경로(예: /Users/Development/myWorkspace)\n${appName}: 예: VS Code\n${dirty}: 활성 편집기가 더티인 경우 더티 표시기\n${separator}: 값이 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \")",
 	"window.newWindowDimensions.default": "화면 가운데에서 새 창을 엽니다.",
 	"window.newWindowDimensions.inherit": "마지막 활성 창과 동일한 크기로 새 창을 엽니다.",
 	"window.newWindowDimensions.maximized": "최대화된 새 창을 엽니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index c355ed115b9..28e7371a153 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "프레임 다시 시작",
 	"removeBreakpoint": "중단점 제거",
 	"removeAllBreakpoints": "모든 중단점 제거",
-	"enableBreakpoint": "중단점 사용",
-	"disableBreakpoint": "중단점 사용 안 함",
 	"enableAllBreakpoints": "모든 중단점 설정",
 	"disableAllBreakpoints": "모든 중단점 해제",
 	"activateBreakpoints": "중단점 활성화",
 	"deactivateBreakpoints": "중단점 비활성화",
 	"reapplyAllBreakpoints": "모든 중단점 다시 적용",
 	"addFunctionBreakpoint": "함수 중단점 추가",
-	"addConditionalBreakpoint": "조건부 중단점 추가...",
-	"editConditionalBreakpoint": "중단점 편집...",
 	"setValue": "값 설정",
 	"addWatchExpression": "식 추가",
 	"editWatchExpression": "식 편집",
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..484e21f6e54
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
+	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
+	"breakpointWidgetHitCountAriaLabel": "적중 횟수가 충족되는 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
+	"breakpointWidgetAriaLabel": "이 조건이 true인 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
+	"expression": "식",
+	"hitCount": "적중 횟수"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 31114fa760b..07989327ee8 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "중단점 편집...",
+	"disableBreakpoint": "중단점 사용 안 함",
+	"enableBreakpoint": "중단점 사용",
 	"removeBreakpoints": "중단점 제거",
 	"removeBreakpointOnColumn": "{0} 열에서 중단점 제거",
 	"removeLineBreakpoint": "줄 중단점 제거",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "{0} 열에서 중단점 사용",
 	"enableBreakpointOnLine": "줄 중단점 사용",
 	"addBreakpoint": "중단점 추가",
+	"conditionalBreakpoint": "조건부 중단점 추가...",
 	"addConfiguration": "구성 추가..."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 53bf2dac9a8..3b9db932452 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -28,7 +28,5 @@
 	"preLaunchTaskExitCode": "preLaunchTask '{0}'이(가) {1} 종료 코드와 함께 종료되었습니다.",
 	"showErrors": "오류 표시",
 	"noFolderWorkspaceDebugError": "활성 파일은 디버그할 수 없습니다. 이 파일이 디스크에 저장되어 있고 해당 파일 형식에 대한 디버그 확장이 설치되어 있는지 확인하세요.",
-	"cancel": "취소",
-	"DebugTaskNotFound": "preLaunchTask '{0}'을(를) 찾을 수 없습니다.",
-	"taskNotTracked": "PreLaunchTask '{0}'을(를) 추적할 수 없습니다."
+	"cancel": "취소"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..73fe67dbadf
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,57 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "확장 이름",
+	"extension id": "확장 ID",
+	"builtin": "기본 제공",
+	"publisher": "게시자 이름",
+	"install count": "설치 수",
+	"rating": "등급",
+	"repository": "리포지토리",
+	"license": "라이선스",
+	"details": "세부 정보",
+	"contributions": "기여",
+	"changelog": "변경 로그",
+	"dependencies": "종속성",
+	"noReadme": "사용 가능한 추가 정보가 없습니다.",
+	"noChangelog": "CHANGELOG를 사용할 수 없습니다.",
+	"noContributions": "참여 없음",
+	"noDependencies": "종속성 없음",
+	"settings": "설정({0})",
+	"setting name": "이름",
+	"description": "설명",
+	"default": "기본값",
+	"debuggers": "디버거({0})",
+	"debugger name": "이름",
+	"debugger type": "유형",
+	"views": "뷰({0})",
+	"view id": "ID",
+	"view name": "이름",
+	"view location": "위치",
+	"localizations": "지역화({0})",
+	"localizations language id": "언어 ID",
+	"localizations localized language name": "언어 이름(지역화됨)",
+	"colorThemes": "색 테마({0})",
+	"iconThemes": "아이콘 테마({0})",
+	"colors": "색({0})",
+	"colorId": "ID",
+	"defaultDark": "어둡게 기본값",
+	"defaultLight": "밝게 기본값",
+	"defaultHC": "고대비 기본값",
+	"JSON Validation": "JSON 유효성 검사({0})",
+	"commands": "명령({0})",
+	"command name": "이름",
+	"keyboard shortcuts": "바로 가기 키(&&K)",
+	"menuContexts": "메뉴 컨텍스트",
+	"languages": "언어({0})",
+	"language id": "ID",
+	"language name": "이름",
+	"file extensions": "파일 확장명",
+	"grammar": "문법",
+	"snippets": "코드 조각"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index c764c2061a4..d88f38093be 100644
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "권장",
 	"otherRecommendedExtensions": "기타 권장 사항",
 	"workspaceRecommendedExtensions": "작업 영역 권장 사항",
-	"builtInExtensions": "기본 제공",
 	"searchExtensions": "마켓플레이스에서 확장 검색",
 	"sort by installs": "정렬 기준: 설치 수",
 	"sort by rating": "정렬 기준: 등급",
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 3c5dd9bb459..42e37cef1b1 100644
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,13 @@
 	"confirmMoveTrashMessageMultiple": "다음 {0}개 파일을 삭제하시겠습니까?",
 	"confirmMoveTrashMessageFolder": "'{0}'과(와) 해당 내용을 삭제할까요?",
 	"confirmMoveTrashMessageFile": "'{0}'을(를) 삭제할까요?",
-	"undoBin": "휴지통에서 복원할 수 있습니다.",
-	"undoTrash": "휴지통에서 복원할 수 있습니다.",
 	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
 	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
 	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
 	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
 	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"cancel": "취소",
-	"permDelete": "영구히 삭제",
+	"deletePermanentlyButtonLabel": "영구 삭제 (&&D)",
+	"retryButtonLabel": "다시 시도 (&&R)",
 	"importFiles": "파일 가져오기",
 	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
 	"replaceButtonLabel": "바꾸기(&&R)",
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..72937e2691d
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "Html 미리 보기"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..a9bf2716767
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "잘못된 편집기 입력입니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..73fa26c6394
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "개발자"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..3a107e5fb3a
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Webview 개발자 도구 열기",
+	"refreshWebviewLabel": "Webview 다시 로드"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 4e28a5c3f06..d95a0ea15d2 100644
--- a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "예",
+	"no": "아니요",
+	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
 	"JsonSchema.locale": "사용할 UI 언어입니다.",
 	"vscode.extension.contributes.localizations": "편집기에 지역화를 적용합니다.",
 	"vscode.extension.contributes.localizations.languageId": "표시 문자열이 번역되는 언어의 ID입니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..6422e6f88c1
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "복사"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..5ea2aa6a147
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "총 {0}개 문제",
+	"filteredProblems": "{1}개 중 {0}개 문제 표시"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..2103b0440bb
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "문제",
+	"tooltip.1": "이 파일의 문제 1개",
+	"tooltip.N": "이 파일의 문제 {0}개",
+	"markers.showOnFile": "파일과 폴더의 오류 및 경고 표시"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..a28f9554902
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "보기",
+	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
+	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
+	"problems.panel.configuration.title": "문제 보기",
+	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
+	"markers.panel.title.problems": "문제",
+	"markers.panel.aria.label.problems.tree": "파일별로 그룹화된 문제",
+	"markers.panel.no.problems.build": "지금까지 작업 영역에서 문제가 감지되지 않았습니다.",
+	"markers.panel.no.problems.filters": "제공된 필터 기준으로 결과를 찾을 수 없습니다.",
+	"markers.panel.action.filter": "문제 필터링",
+	"markers.panel.filter.placeholder": "형식 또는 텍스트로 필터링",
+	"markers.panel.filter.errors": "오류",
+	"markers.panel.filter.warnings": "경고",
+	"markers.panel.filter.infos": "정보",
+	"markers.panel.single.error.label": "오류 1개",
+	"markers.panel.multiple.errors.label": "오류 {0}개",
+	"markers.panel.single.warning.label": "경고 1개",
+	"markers.panel.multiple.warnings.label": "경고 {0}개",
+	"markers.panel.single.info.label": "정보 1개",
+	"markers.panel.multiple.infos.label": "정보 {0}개",
+	"markers.panel.single.unknown.label": "알 수 없음 1개",
+	"markers.panel.multiple.unknowns.label": "알 수 없음 {0}개",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0}에 {1}개의 문제가 있음",
+	"errors.warnings.show.label": "오류 및 경고 표시"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index ada854f50d6..b5c27aa50bb 100644
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "다음 검색 포함 패턴 표시",
 	"previousSearchIncludePattern": "이전 검색 포함 패턴 표시",
-	"nextSearchExcludePattern": "다음 검색 제외 패턴 표시",
-	"previousSearchExcludePattern": "이전 검색 제외 패턴 표시",
 	"nextSearchTerm": "다음 검색어 표시",
 	"previousSearchTerm": "이전 검색어 표시",
 	"showSearchViewlet": "검색 표시",
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
index c98e307c23b..863a56d6989 100644
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "검색 세부 정보 설정/해제",
-	"searchScope.includes": "포함할 파일",
-	"label.includes": "패턴 포함 검색",
-	"searchScope.excludes": "제외할 파일",
-	"label.excludes": "패턴 제외 검색",
 	"replaceAll.confirmation.title": "모두 바꾸기",
 	"replaceAll.confirm.button": "바꾸기(&&R)",
 	"replaceAll.occurrence.file.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 5c6abe93d98..a5f47526ecf 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -10,6 +10,7 @@
 	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "문제 패턴이 잘못되었습니다. Kind 속성은 첫 번째 요소에만 지정해야 합니다.",
 	"ProblemPatternParser.problemPattern.missingRegExp": "문제 패턴에 정규식이 없습니다.",
 	"ProblemPatternParser.problemPattern.missingProperty": "문제 패턴이 잘못되었습니다. 하나 이상의 파일 및 메시지를 포함해야 합니다.",
+	"ProblemPatternParser.problemPattern.missingLocation": "문제 패턴이 잘못되었습니다. \"파일\" 종류, 줄 또는 위치 일치 그룹을 포함해야 합니다.",
 	"ProblemPatternParser.invalidRegexp": "오류: {0} 문자열은 유효한 정규식이 아닙니다.\n",
 	"ProblemPatternSchema.regexp": "출력에서 오류, 경고 또는 정보를 찾는 정규식입니다.",
 	"ProblemPatternSchema.kind": "패턴이 위치(파일 및 줄)와 일치하는지 또는 파일하고만 일치하는지 여부입니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 58e2a3a2594..e02ee2a8a5f 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "작업을 그룹에 할당 안 함",
 	"JsonSchema.tasks.group": "이 작업을 할당할 실행 그룹을 정의합니다. 빌드 그룹에 추가를 위한 \"build'와 테스트 그룹에 추가를 위한 \"test\"를 지원합니다.",
 	"JsonSchema.tasks.type": "작업이 프로세스로 실행되는지 또는 셸 내의 명령으로 실행되는지를 제어합니다.",
+	"JsonSchema.command": "실행할 명령이며, 외부 프로그램 또는 셸 명령입니다.",
+	"JsonSchema.tasks.args": "이 작업이 호출될 때 명령에 전달되는 인수입니다.",
 	"JsonSchema.tasks.label": "작업 사용자 인터페이스 레이블",
 	"JsonSchema.version": "구성의 버전 번호입니다.",
 	"JsonSchema.tasks.identifier": "작업을 launch.json 또는 dependsOn 구문에서 참조할 사용자 정의 식별자입니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 82af7f681be..9fba55129c8 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,10 @@
 	],
 	"tasksCategory": "작업",
 	"ConfigureTaskRunnerAction.label": "작업 구성",
-	"problems": "문제",
+	"totalErrors": "오류 {0}개",
+	"totalWarnings": "경고 {0}개",
+	"totalInfos": "정보 {0}개",
 	"building": "빌드하고 있습니다...",
-	"manyMarkers": "99+",
 	"runningTasks": "실행 중인 작업 표시",
 	"tasks": "작업",
 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
@@ -47,6 +48,7 @@
 	"configured": "구성된 작업",
 	"detected": "감지된 작업",
 	"TaskService.notAgain": "다시 표시 안 함",
+	"TaskService.ignoredFolder": "작업 버전 0.1.0을 사용하기 때문에 다음 작업 영역 폴더는 무시됩니다. {0}",
 	"TaskService.pickRunTask": "실행할 작업 선택",
 	"TaslService.noEntryToRun": "실행할 작업이 없습니다. 작업 구성...",
 	"TaskService.fetchingBuildTasks": "빌드 작업을 페치하는 중...",
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index f136929d825..d7f18841ff1 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "오류: 작업 구성 '{0}'에 필요한 속성 '{1}'이(가) 없습니다. 작업 구성이 무시됩니다.",
 	"ConfigurationParser.notCustom": "오류: 작업이 사용자 지정 작업으로 선언되지 않았습니다. 이 구성은 무시됩니다.\n{0}\n",
 	"ConfigurationParser.noTaskName": "오류: 작업에서 레이블 속성을 제공해야 합니다. 이 작업은 무시됩니다.\n{0}\n",
-	"taskConfiguration.shellArgs": "경고: '{0}' 작업은 셸 명령이며 인수 중 하나에 이스케이프되지 않은 공백이 있을 수 있습니다. 올바른 명령줄 인용인지 확인하려면 인수를 명령으로 병합하세요.",
 	"taskConfiguration.noCommandOrDependsOn": "오류: 작업 '{0}'에서 명령이나 dependsOn 속성을 지정하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는 {1}입니다.",
 	"taskConfiguration.noCommand": "오류: 작업 '{0}'에서 명령을 정의하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는\n{1}입니다.",
 	"TaskParse.noOsSpecificGlobalTasks": "작업 버전 2.0.0은 글로벌 OS별 작업을 지원하지 않습니다. OS별 명령을 사용하여 작업으로 변환하세요. 영향을 받는 작업::\n{0}"
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index b95ca94304a..6260df300a8 100644
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "복사",
+	"split": "분할",
 	"paste": "붙여넣기",
 	"selectAll": "모두 선택",
-	"clear": "지우기",
-	"split": "분할"
+	"clear": "지우기"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..3314e92b45d
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "릴리스 정보: {0}",
+	"unassigned": "할당되지 않음"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index b925a01c2ad..42eb2d479ae 100644
--- a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "나중에",
-	"unassigned": "할당되지 않음",
 	"releaseNotes": "릴리스 정보",
 	"showReleaseNotes": "릴리스 정보 표시",
 	"read the release notes": "{0} v{1}을(를) 시작합니다. 릴리스 정보를 확인하시겠습니까?",
diff --git a/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..4a956b0bd25
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "webview 편집기"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..3b2a1e0eaac
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "자세히 알아보기"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..83747fca0e8
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} 은(는) 멀티 폴더 작업 영역에서 확인할 수 없습니다. : 와 폴더 이름을 사용하여 변수 범위를 정합니다.",
+	"canNotResolveWorkspaceFolder": "${workspaceFolder} 을(를) 확인할 수 없습니다. 폴더를 여십시오.",
+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} 은(는) 멀티 폴더 작업 영역에서 확인할 수 없습니다. : 와 폴더 이름을 사용하여 변수 범위를 정합니다.",
+	"canNotResolveFolderBasename": "${workspaceFolderBasename} 을(를) 확인할 수 없습니다. 폴더를 여십시오.",
+	"canNotResolveLineNumber": "${lineNumber} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
+	"canNotResolveFile": "${file} 을(를) 확인할 수 없으므로, 편집기를 여십시오.",
+	"canNotResolveRelativeFile": "${relativeFile} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
+	"canNotResolveFileDirname": "${fileDirname} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
+	"canNotResolveFileExtname": "${fileExtname} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
+	"canNotResolveFileBasename": "${fileBasename} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} 을(를) 확인할 수 없습니다. 편집기를 여십시오."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..96048859920
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "예(&&Y)",
+	"cancelButton": "취소"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 0622ba5a8bb..eb17227dbfa 100644
--- a/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,6 @@
 	"neverShowAgain": "다시 표시 안 함",
 	"netVersionError": "Microsoft .NET Framework 4.5가 필요합니다. 설치하려면 링크를 클릭하세요.",
 	"learnMore": "지침",
-	"enospcError": "{0}에 파일 핸들이 부족합니다. 지침 링크를 클릭하여 문제를 해결하세요.",
 	"binFailed": "'{0}'을(를) 휴지통으로 이동하지 못함",
 	"trashFailed": "'{0}'을(를) 휴지통으로 이동하지 못함"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
index 92d933fa231..d411f384a72 100644
--- a/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "잘못된 파일 리소스({0})",
 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
 	"fileNotModifiedError": "파일 수정 안 됨",
-	"fileTooLargeForHeapError": "파일 크기가 창 메모리 제한을 초과합니다. --max-memory=NEWSIZE 코드를 실행해 보세요.",
 	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
 	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
diff --git a/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..d4f0c4c0f4d 100644
--- a/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "취소"
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/clojure/package.i18n.json b/i18n/ptb/extensions/clojure/package.i18n.json
index 978c999faf1..d146e27fa42 100644
--- a/i18n/ptb/extensions/clojure/package.i18n.json
+++ b/i18n/ptb/extensions/clojure/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Clojure"
+	"displayName": "Noções Básicas Sobre a Linguagem Clojure",
+	"description": "Fornece realce de sintaxe e correspondência de suporte e dobramento em arquivos Clojure."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/coffeescript/package.i18n.json b/i18n/ptb/extensions/coffeescript/package.i18n.json
index 03d413fad32..95fe95501c9 100644
--- a/i18n/ptb/extensions/coffeescript/package.i18n.json
+++ b/i18n/ptb/extensions/coffeescript/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem CoffeeScript"
+	"displayName": "Noções Básicas Sobre a Linguagem CoffeeScript",
+	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos CoffeeScript."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 3a30e02d2db..7e7a9ca7e1d 100644
--- a/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -13,7 +13,7 @@
 	"rootPath": "caminho do arquivo da área de trabalho (por exemplo, /Usuarios/Desenvolvimento/minhaAreadeTrabalho)",
 	"folderName": "nome do diretório da área de trabalho onde arquivo está localizado (por exemplo, myFolder)",
 	"folderPath": "caminho do arquivo no diretório da área de trabalho onde o arquivo está localizado (por exemplo, /Users/Development/myFolder)",
-	"appName": "e.g. VS Code",
+	"appName": "por exemplo VS Code",
 	"dirty": "Um indicador de alteração se o editor ativo foi alterado",
 	"separator": "um separador condicional (' - ') que somente é mostrado quando envolvido por variáveis com valores",
 	"assocLabelFile": "Arquivos com Extensão",
diff --git a/i18n/ptb/extensions/cpp/package.i18n.json b/i18n/ptb/extensions/cpp/package.i18n.json
index 0ef1e68fec5..08236c7ff81 100644
--- a/i18n/ptb/extensions/cpp/package.i18n.json
+++ b/i18n/ptb/extensions/cpp/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem C/C++"
+	"displayName": "Noções Básicas Sobre a Linguagem C/C++",
+	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos C/C++."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..d8cc2994174
--- /dev/null
+++ b/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "Servidor de linguagem CSS",
+	"folding.start": "Início da Região Expansível",
+	"folding.end": "Fim da Região Expansível"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css-language-features/package.i18n.json b/i18n/ptb/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..c6bb31b4fbc
--- /dev/null
+++ b/i18n/ptb/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,79 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Recursos da Linguagem CSS",
+	"description": "Fornece suporte de linguagem rico para arquivos CSS, LESS e SCSS.",
+	"css.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
+	"css.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
+	"css.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
+	"css.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
+	"css.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
+	"css.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
+	"css.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
+	"css.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
+	"css.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
+	"css.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
+	"css.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
+	"css.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
+	"css.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
+	"css.lint.unknownProperties.desc": "Propriedade desconhecida.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
+	"css.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
+	"css.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
+	"css.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem CSS.",
+	"css.validate.title": "Controla a validação CSS and a gravidade dos problemas.",
+	"css.validate.desc": "Habilita ou desabilita todas as validações",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
+	"less.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
+	"less.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
+	"less.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
+	"less.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
+	"less.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
+	"less.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
+	"less.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
+	"less.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
+	"less.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
+	"less.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
+	"less.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
+	"less.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
+	"less.lint.unknownProperties.desc": "Propriedade desconhecida.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
+	"less.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
+	"less.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
+	"less.validate.title": "Controla MENOS as severidades de validação e problemas.",
+	"less.validate.desc": "Habilita ou desabilita todas as validações",
+	"scss.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
+	"scss.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
+	"scss.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
+	"scss.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
+	"scss.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
+	"scss.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
+	"scss.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
+	"scss.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
+	"scss.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
+	"scss.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
+	"scss.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
+	"scss.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
+	"scss.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
+	"scss.lint.unknownProperties.desc": "Propriedade desconhecida.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
+	"scss.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
+	"scss.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
+	"scss.validate.title": "Controla severidades de validação e problemas SCSS.",
+	"scss.validate.desc": "Habilita ou desabilita todas as validações",
+	"less.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"scss.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"css.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"css.colorDecorators.enable.deprecationMessage": "A configuração 'css.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
+	"scss.colorDecorators.enable.deprecationMessage": "A configuração 'scss.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
+	"less.colorDecorators.enable.deprecationMessage": "A configuração 'less.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css/package.i18n.json b/i18n/ptb/extensions/css/package.i18n.json
index 420064cea8b..35229bd6699 100644
--- a/i18n/ptb/extensions/css/package.i18n.json
+++ b/i18n/ptb/extensions/css/package.i18n.json
@@ -5,77 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Recursos da Linguagem CSS",
-	"description": "Fornece suporte de linguagem rico para arquivos CSS, LESS e SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"css.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"css.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"css.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"css.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"css.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"css.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"css.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"css.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"css.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"css.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"css.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"css.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"css.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"css.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"css.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"css.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem CSS.",
-	"css.validate.title": "Controla a validação CSS and a gravidade dos problemas.",
-	"css.validate.desc": "Habilita ou desabilita todas as validações",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"less.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"less.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"less.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"less.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"less.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"less.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"less.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"less.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"less.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"less.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"less.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"less.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"less.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"less.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"less.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"less.validate.title": "Controla MENOS as severidades de validação e problemas.",
-	"less.validate.desc": "Habilita ou desabilita todas as validações",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"scss.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"scss.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"scss.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"scss.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"scss.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"scss.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"scss.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"scss.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"scss.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"scss.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"scss.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"scss.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"scss.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"scss.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"scss.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"scss.validate.title": "Controla severidades de validação e problemas SCSS.",
-	"scss.validate.desc": "Habilita ou desabilita todas as validações",
-	"less.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-	"scss.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-	"css.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-	"css.colorDecorators.enable.deprecationMessage": "A configuração 'css.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"scss.colorDecorators.enable.deprecationMessage": "A configuração 'scss.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"less.colorDecorators.enable.deprecationMessage": "A configuração 'less.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/commands.i18n.json b/i18n/ptb/extensions/git/out/commands.i18n.json
index c27be95a183..afacddeaf5a 100644
--- a/i18n/ptb/extensions/git/out/commands.i18n.json
+++ b/i18n/ptb/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "OK",
 	"push with tags success": "Envio de rótulos finalizado com sucesso.",
 	"pick remote": "Pegue um  remoto para publicar o ramo '{0}':",
-	"sync is unpredictable": "Esta ação vai fazer push e pull nos commits de e para '{0}'.",
 	"never again": "OK, Não Mostrar Novamente",
 	"no remotes to publish": "Seu repositório não possui remotos configurados para publicação.",
 	"no changes stash": "Não há nenhuma mudança para esconder.",
diff --git a/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..6e9a973c172
--- /dev/null
+++ b/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "Servidor de Linguagem HTML",
+	"folding.start": "Início da Região Expansível",
+	"folding.end": "Fim da Região Expansível"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html-language-features/package.i18n.json b/i18n/ptb/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..cbbf188d7c1
--- /dev/null
+++ b/i18n/ptb/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Recursos da Linguagem HTML",
+	"description": "Fornece suporte de linguagem rico para arquivos HTML, Razor e Handlebar.",
+	"html.format.wrapLineLength.desc": "Quantidade máxima de caracteres por linha (0 = desativar).",
+	"html.format.unformatted.desc": "Lista de tags, separados por vírgula, que não deveria ser reformatada. o padrão é 'nulo' para todas as tags listadas em https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Lista de tags, separada por vírgula, onde o conteúdo não deve ser reformatado. o padrão é 'nulo' para a tag 'pré'.",
+	"html.format.indentInnerHtml.desc": "Indentar secões <head>e <body>.",
+	"html.format.preserveNewLines.desc": "Se quebras de linha existentes antes de elementos deveriam ser preservadas. Só funciona antes de elementos, não dentro de rótulos ou para texto.",
+	"html.format.maxPreserveNewLines.desc": "Número máximo de quebras de linha a serem preservadas em um bloco. Use 'null' para ilimitado.",
+	"html.format.indentHandlebars.desc": "Formatar e indentar {{#foo}} e {{/ foo}}.",
+	"html.format.endWithNewline.desc": "Finalizar com uma nova linha.",
+	"html.format.extraLiners.desc": "Lista de rótulos, separados por vírgulas, que deveriam ter uma quebra de linha extra antes deles. 'null' admite o padrão \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Agrupar atributos.",
+	"html.format.wrapAttributes.auto": "Agrupar atributos somente quando o tamanho da linha é excedido.",
+	"html.format.wrapAttributes.force": "Agrupar cada atributo exceto o primeiro.",
+	"html.format.wrapAttributes.forcealign": "Agrupar cada atributo, exceto o primeiro e manter alinhado.",
+	"html.format.wrapAttributes.forcemultiline": "Agrupar cada atributo.",
+	"html.suggest.angular1.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos e propriedades do Angular V1.",
+	"html.suggest.ionic.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores Ionic.",
+	"html.suggest.html5.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores HTML5.",
+	"html.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem HTML.",
+	"html.validate.scripts": "Configura se o suporte da linguagem HTML interna valida scripts embutidos.",
+	"html.validate.styles": "Configura se o suporte da linguagem HTML interna valida estilos embutidos.",
+	"html.autoClosingTags": "Ativar/desativar o fechamento automático de tags HTML."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html/package.i18n.json b/i18n/ptb/extensions/html/package.i18n.json
index 2ca6fef99c5..35229bd6699 100644
--- a/i18n/ptb/extensions/html/package.i18n.json
+++ b/i18n/ptb/extensions/html/package.i18n.json
@@ -5,30 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Recursos da Linguagem HTML",
-	"description": "Fornece suporte de linguagem rico para arquivos HTML, Razor e Handlebar.",
-	"html.format.enable.desc": "Ativar/desativar o formatador HTML padrão",
-	"html.format.wrapLineLength.desc": "Quantidade máxima de caracteres por linha (0 = desativar).",
-	"html.format.unformatted.desc": "Lista de tags, separados por vírgula, que não deveria ser reformatada. o padrão é 'nulo' para todas as tags listadas em https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Lista de tags, separada por vírgula, onde o conteúdo não deve ser reformatado. o padrão é 'nulo' para a tag 'pré'.",
-	"html.format.indentInnerHtml.desc": "Indentar secões <head>e <body>.",
-	"html.format.preserveNewLines.desc": "Se quebras de linha existentes antes de elementos deveriam ser preservadas. Só funciona antes de elementos, não dentro de rótulos ou para texto.",
-	"html.format.maxPreserveNewLines.desc": "Número máximo de quebras de linha a serem preservadas em um bloco. Use 'null' para ilimitado.",
-	"html.format.indentHandlebars.desc": "Formatar e indentar {{#foo}} e {{/ foo}}.",
-	"html.format.endWithNewline.desc": "Finalizar com uma nova linha.",
-	"html.format.extraLiners.desc": "Lista de rótulos, separados por vírgulas, que deveriam ter uma quebra de linha extra antes deles. 'null' admite o padrão \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Agrupar atributos.",
-	"html.format.wrapAttributes.auto": "Agrupar atributos somente quando o tamanho da linha é excedido.",
-	"html.format.wrapAttributes.force": "Agrupar cada atributo exceto o primeiro.",
-	"html.format.wrapAttributes.forcealign": "Agrupar cada atributo, exceto o primeiro e manter alinhado.",
-	"html.format.wrapAttributes.forcemultiline": "Agrupar cada atributo.",
-	"html.suggest.angular1.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos e propriedades do Angular V1.",
-	"html.suggest.ionic.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores Ionic.",
-	"html.suggest.html5.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores HTML5.",
-	"html.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem HTML.",
-	"html.validate.scripts": "Configura se o suporte da linguagem HTML interna valida scripts embutidos.",
-	"html.validate.styles": "Configura se o suporte da linguagem HTML interna valida estilos embutidos.",
-	"html.experimental.syntaxFolding": "Habilita/Desabilita a sintaxe dos marcadores de pastas ativas.",
-	"html.autoClosingTags": "Ativar/desativar o fechamento automático de tags HTML."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..3db289491e4
--- /dev/null
+++ b/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "Servidor de linguagem JSON"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json-language-features/package.i18n.json b/i18n/ptb/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..5be341b6196
--- /dev/null
+++ b/i18n/ptb/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Recursos da Linguagem JSON",
+	"description": "Fornece suporte de linguagem rico para arquivos JSON.",
+	"json.schemas.desc": "Esquemas associadas a arquivos de JSON no projeto atual",
+	"json.schemas.url.desc": "Um URL para um esquema ou um caminho relativo a um esquema no diretório atual",
+	"json.schemas.fileMatch.desc": "Uma matriz de padrões de arquivos para correspondência ao resolver arquivos JSON para esquemas.",
+	"json.schemas.fileMatch.item.desc": "Um padrão de arquivos que pode conter '*' para fazer a correspondência ao resolver arquivos JSON para esquemas.",
+	"json.schemas.schema.desc": "A definição de esquema para o URL dado. O esquema precisa ser fornecido apenas para evitar acessos ao URL do esquema.",
+	"json.format.enable.desc": "Habilitar/desabilitar o formatador JSON padrão (requer reinicialização)",
+	"json.tracing.desc": "Loga a comunicação entre o VS Code e o servidor de linguagem JSON.",
+	"json.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"json.colorDecorators.enable.deprecationMessage": "A configuração 'json.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json/package.i18n.json b/i18n/ptb/extensions/json/package.i18n.json
index 2888e93dfe4..35229bd6699 100644
--- a/i18n/ptb/extensions/json/package.i18n.json
+++ b/i18n/ptb/extensions/json/package.i18n.json
@@ -5,17 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Recursos da Linguagem JSON",
-	"description": "Fornece suporte de linguagem rico para arquivos JSON.",
-	"json.schemas.desc": "Esquemas associadas a arquivos de JSON no projeto atual",
-	"json.schemas.url.desc": "Um URL para um esquema ou um caminho relativo a um esquema no diretório atual",
-	"json.schemas.fileMatch.desc": "Uma matriz de padrões de arquivos para correspondência ao resolver arquivos JSON para esquemas.",
-	"json.schemas.fileMatch.item.desc": "Um padrão de arquivos que pode conter '*' para fazer a correspondência ao resolver arquivos JSON para esquemas.",
-	"json.schemas.schema.desc": "A definição de esquema para o URL dado. O esquema precisa ser fornecido apenas para evitar acessos ao URL do esquema.",
-	"json.format.enable.desc": "Habilitar/desabilitar o formatador JSON padrão (requer reinicialização)",
-	"json.tracing.desc": "Loga a comunicação entre o VS Code e o servidor de linguagem JSON.",
-	"json.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
-	"json.colorDecorators.enable.deprecationMessage": "A configuração 'json.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"json.experimental.syntaxFolding": "Habilita/Desabilita a sintaxe dos marcadores de pastas ativas."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-basics/package.i18n.json b/i18n/ptb/extensions/markdown-basics/package.i18n.json
index 35229bd6699..1f82410c626 100644
--- a/i18n/ptb/extensions/markdown-basics/package.i18n.json
+++ b/i18n/ptb/extensions/markdown-basics/package.i18n.json
@@ -5,5 +5,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."
-	]
+	],
+	"displayName": "Noções Básicas Sobre a Linguagem Markdown"
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..b72e8b907d6
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "Não foi possível carregar o 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..c84ba98d829
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[Pré-visualização] {0}",
+	"previewTitle": "Pré-visualização {0}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..92d5546b323
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.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."
+	],
+	"preview.securityMessage.title": "Conteúdo potencialmente inseguro foi desativado na visualização de remarcação. Altere a configuração de segurança de visualização do Markdown para permitir conteúdo inseguro ou habilitar scripts",
+	"preview.securityMessage.label": "Conteúdo do Aviso de Segurança Desativado"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..e8aa71537e2
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.description": "Somente carregar conteúdo seguro",
+	"insecureContent.title": "Permitir conteúdo inseguro",
+	"disable.title": "Desabilitar",
+	"disable.description": "Permitir a execução de conteúdo e scripts. Não recomendado",
+	"moreInfo.title": "Mais informações",
+	"enableSecurityWarning.title": "Habilitar a visualização de avisos de segurança neste espaço de trabalho",
+	"disableSecurityWarning.title": "Desabilitar a visualização de avisos de segurança neste espaço de trabalho"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/package.i18n.json b/i18n/ptb/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..30cdb8f363d
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,26 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Recursos da Linguagem Markdown",
+	"description": "Fornece suporte à linguagem rica para Markdown.",
+	"markdown.preview.breaks.desc": "Configura como quebras de linha são processadas na visualização de markdown. Configurando como 'true' cria um <br> para cada nova linha.",
+	"markdown.preview.linkify": "Habilitar ou desabilitar a conversão de texto URL para links na visualização markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Duplo clique na pré-visualização markdown para alternar para o editor.",
+	"markdown.preview.fontFamily.desc": "Controla a família de fonte usada na pré-visualização de markdown.",
+	"markdown.preview.fontSize.desc": "Controla o tamanho da fonte em pixels usado na pré-visualização de markdown.",
+	"markdown.preview.lineHeight.desc": "Controla a altura de linha usada na pré-visualização de markdown. Este número é relativo ao tamanho de fonte.",
+	"markdown.preview.markEditorSelection.desc": "Marca a seleção atual do editor na pré-visualização de markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Quando uma pré-visualização de markdown é rolada, atualiza a exibição do editor.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Quando um editor de markdown é rolado, atualiza a exibição da pré-visualização.",
+	"markdown.preview.title": "Abrir a visualização",
+	"markdown.previewFrontMatter.dec": "Configura como o frontispicio YAML frente questão devem ser processado na pré-visualização de markdown. 'hide' remove o frontispicio. Caso contrário, o frontispicio é tratado como conteúdo de markdown.",
+	"markdown.previewSide.title": "Abre pré-visualização ao lado",
+	"markdown.showSource.title": "Exibir Código-Fonte",
+	"markdown.styles.dec": "Uma lista de URLs ou caminhos locais para folhas de estilo CSS para usar na pré-visualização do markdown. Caminhos relativos são interpretados em relação à pasta aberta no explorer. Se não houver nenhuma pasta aberta, eles são interpretados em relação ao local do arquivo markdown. Todos os ' \\' precisam ser escritos como ' \\ \\ '.",
+	"markdown.trace.desc": "Habilitar log de depuração para a extensão do markdown."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..bfb1b796def
--- /dev/null
+++ b/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "Você permite {0} (definido como uma configuração do espaço de trabalho) a ser executado para lint de arquivos PHP?",
+	"php.yes": "Permitir",
+	"php.no": "Não permitir",
+	"wrongExecutable": "Não é possível validar {0} pois não é um executável php válido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
+	"noExecutable": "Não é possível validar porque nenhum executável PHP está definido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
+	"unknownReason": "Falha ao executar o php usando o caminho: {0}. O motivo é desconhecido."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php-language-features/package.i18n.json b/i18n/ptb/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..a88cd375f35
--- /dev/null
+++ b/i18n/ptb/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Configura se as sugestões intrínsecas da linguagem PHP estão habilitadas. O suporte sugere globais e variáveis do PHP.",
+	"configuration.validate.enable": "Habilita/desabilita a validação interna do PHP.",
+	"configuration.validate.executablePath": "Aponta para o executável do PHP.",
+	"configuration.validate.run": "Se o linter é executado ao salvar ou ao digitar.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Desabilita a validação de executável do PHP (definida como configuração do espaço de trabalho)"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php/package.i18n.json b/i18n/ptb/extensions/php/package.i18n.json
index 171cc8de307..324291e15f7 100644
--- a/i18n/ptb/extensions/php/package.i18n.json
+++ b/i18n/ptb/extensions/php/package.i18n.json
@@ -6,12 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Configura se as sugestões intrínsecas da linguagem PHP estão habilitadas. O suporte sugere globais e variáveis do PHP.",
-	"configuration.validate.enable": "Habilita/desabilita a validação interna do PHP.",
-	"configuration.validate.executablePath": "Aponta para o executável do PHP.",
-	"configuration.validate.run": "Se o linter é executado ao salvar ou ao digitar.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Desabilita a validação de executável do PHP (definida como configuração do espaço de trabalho)",
 	"displayName": "Recursos da linguagem PHP"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 6a08afe545f..57e561ae158 100644
--- a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "Nenhum resultado encontrado",
 	"settingsSearchIssue": "Problema na Pesquisa de Configurações",
 	"bugReporter": "Relatório de Bug",
-	"performanceIssue": "Problema de Performance",
 	"featureRequest": "Solicitação de Recurso",
+	"performanceIssue": "Problema de Performance",
 	"stepsToReproduce": "Etapas para Reproduzir",
 	"bugDescription": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
 	"performanceIssueDesciption": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
diff --git a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index cfbca1eb679..9dcb83270fb 100644
--- a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -18,9 +18,13 @@
 	"extensions": "Minhas extensões",
 	"searchedExtensions": "Extensões Pesquisadas",
 	"settingsSearchDetails": "Detalhes da Pesquisa de Configurações",
+	"tryDisablingExtensions": "O problema é reproduzível quando as extensões são desabilitadas?",
 	"yes": "Sim",
 	"no": "Não",
+	"disableExtensionsLabelText": "Tente reproduzir o problema depois de {0}.",
 	"disableExtensions": "desabilitando todas as extensões e recarregando a janela",
+	"showRunningExtensionsLabelText": "Se você suspeita que isso seja um problema de extensão, {0} para reportar o problema com a extensão.",
+	"showRunningExtensions": "ver todas as extensões em execução",
 	"details": "Por favor informe detalhes.",
 	"loadingData": "Carregando dados..."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json b/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
index 413a18b3d90..0d8ffc448c9 100644
--- a/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
@@ -9,6 +9,7 @@
 	"invalidEndpoint": "Destino para envio do log é inválido.",
 	"beginUploading": "Enviando...",
 	"didUploadLogs": "Envio bem-sucedido! ID do arquivo de Log: {0}",
+	"logUploadPromptHeader": "Você está prestes a fazer o envio de seus logs de sessão para um ponto de extremidade seguro da Microsoft e que apenas membros da equipe Microsoft e do time VS Code podem acessar.",
 	"logUploadPromptBody": "Logs de sessão podem conter informações pessoais como caminhos completos ou conteúdos de arquivos. Por favor revise e elimine seus arquivos de log de sessão aqui: '{0}'",
 	"logUploadPromptBodyDetails": "Ao continuar você confirma que você revisou e eliminou seus arquivos de log de sessão e que você concorda que a Microsoft use eles para depurar o VS Code.",
 	"logUploadPromptAcceptInstructions": "Por favor execute o code com '--upload-logs={0}' para proceder com o upload",
diff --git a/i18n/ptb/src/vs/code/electron-main/menus.i18n.json b/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
index eef1af7a303..19bc2c801cd 100644
--- a/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
@@ -93,6 +93,7 @@
 	"miOpenView": "&&Abrir Visualização...",
 	"miToggleFullScreen": "Alternar &&Tela Inteira",
 	"miToggleZenMode": "Alternar modo Zen",
+	"miToggleCenteredLayout": "Alternar para Layout Centralizado",
 	"miToggleMenuBar": "Alternar &&Barra de Menus",
 	"miSplitEditor": "Dividir &&editor",
 	"miToggleEditorLayout": "Alternar &&Layout do Grupo de Editor",
diff --git a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 2b9a537a3bb..7ac6b700d4b 100644
--- a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,6 @@
 	"warningBorder": "Cor da borda das linhas onduladas de aviso no editor.",
 	"infoForeground": "Cor do primeiro plano das linhas de informação no editor.",
 	"infoBorder": "Cor da borda das linhas de informação no editor.",
-	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para intervalos de destaques.",
 	"overviewRuleError": "Visão geral da cor do marcador da régua para erros.",
 	"overviewRuleWarning": "Visão geral da cor do marcador da régua para avisos.",
 	"overviewRuleInfo": "Visão geral da cor do marcador da régua para informações."
diff --git a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 84ea506500f..8d9a0536028 100644
--- a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Ir para o Próximo Problema (Erro, Aviso, Informação)",
-	"markerAction.previous.label": "Ir para o Problema Anterior (Erro, Aviso, Informação)",
-	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
-	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
-	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
-	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
+	"markerAction.previous.label": "Ir para o Problema Anterior (Erro, Aviso, Informação)"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..e76001982d3
--- /dev/null
+++ b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
+	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
+	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
+	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 46ba9518381..882f079794f 100644
--- a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,6 @@
 	"wordHighlightStrong": "Cor de fundo de um símbolo durante o acesso de escrita, como ao escrever uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
 	"wordHighlightBorder": "Cor de fundo de um símbolo durante acesso de leitura, como ao ler uma variável.",
 	"wordHighlightStrongBorder": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.",
-	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos.",
-	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para gravação de destaques de símbolos.",
 	"wordHighlight.next.label": "Ir para o próximo símbolo em destaque",
 	"wordHighlight.previous.label": "Ir para o símbolo de destaque anterior"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..f3c382a82fa
--- /dev/null
+++ b/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "... 1 arquivo adicional não está mostrado",
+	"moreFiles": "... {0} arquivos adicionais não estão mostrados"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..4a277edc564
--- /dev/null
+++ b/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 3ceced97733..fd53e61c4d3 100644
--- a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,12 @@
 	"errorInstallingDependencies": "Erro ao instalar dependências. {0}",
 	"MarketPlaceDisabled": "Loja não está habilitada.",
 	"removeError": "Erro ao remover a extensão: {0}. por favor, Saia e Inicie o VS Code antes de tentar novamente.",
-	"Not Market place extension": "Somente Extensões da Loja podem ser reinstaladas",
 	"notFoundCompatible": "Não foi possível instalar '{0}; não existe nenhuma versão compatível com o VSCode '{1}'.",
 	"malicious extension": "Não foi possível instalar a extensão, pois foi relatada como problemática.",
 	"notFoundCompatibleDependency": "Não foi possível instalar porque a extensão dependente '{0}' compatível com a versão atual '{1}' do VS Code não foi encontrada.",
 	"quitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
 	"exitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
 	"uninstallDependeciesConfirmation": "Gostaria de desinstalar '{0}' somente, ou suas dependências também?",
-	"uninstallOnly": "Apenas",
-	"uninstallAll": "Todos",
 	"uninstallConfirmation": "Tem certeza que deseja desinstalar '{0}'?",
 	"ok": "OK",
 	"singleDependentError": "Não foi possível desinstalar a extensão '{0}'. A extensão '{1}' depende dela.",
diff --git a/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json b/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..1b82ec1834e
--- /dev/null
+++ b/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Erro",
+	"sev.warning": "Aviso",
+	"sev.info": "Informações"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
index 0103ae9995b..e1497a91dee 100644
--- a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -92,7 +92,5 @@
 	"mergeBorder": "Cor da borda dos cabeçalhos e separadores estão em conflito de mesclagem em linha.",
 	"overviewRulerCurrentContentForeground": "Cor de fundo de régua de visuaização atual em conflito de mesclagem em linha.",
 	"overviewRulerIncomingContentForeground": "Cor de fundo de régua de visuaização de entrada em conflito de mesclagem em linha.",
-	"overviewRulerCommonContentForeground": "Ancestral comum da cor da régua de visão geral para conflitos de mesclagem inline.",
-	"overviewRulerFindMatchForeground": "Visão geral da cor do marcador da régua para buscas correspondentes.",
-	"overviewRulerSelectionHighlightForeground": "Visão geral da cor do marcador da régua para a seleção de destaques"
+	"overviewRulerCommonContentForeground": "Ancestral comum da cor da régua de visão geral para conflitos de mesclagem inline."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
index ffe76f5613e..f318947e97c 100644
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"extensionSource": "{0} (Extensão)",
 	"defaultSource": "Extensão",
 	"manageExtension": "Gerenciar Extensão",
 	"cancel": "Cancelar",
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..d53bcb288c2
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"extensionSource": "{0} (Extensão)"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
index 4a8523b9b47..745e5b68758 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
@@ -19,6 +19,7 @@
 	"close": "Fechar",
 	"closeOthers": "Fechar Outros",
 	"closeRight": "Fechar à direita",
+	"closeAllSaved": "Fechar Salvos",
 	"closeAll": "Fechar todos",
 	"keepOpen": "Manter aberto",
 	"toggleInlineView": "Alternar para exibição embutida",
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 3d0849e2d3d..8f7c2c32373 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Focalizar próximo grupo",
 	"openToSide": "Aberto para o lado",
 	"closeEditor": "Fechar editor",
+	"closeOneEditor": "Fechar",
 	"revertAndCloseActiveEditor": "Reverter e fechar editor",
 	"closeEditorsToTheLeft": "Fechar editores à esquerda ",
 	"closeAllEditors": "Fechar todos editores",
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index af4bb7c1e23..4b815cd265a 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Fechar",
 	"araLabelEditorActions": "Ações de editor"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
index ef35b7db33c..970ea3ec097 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
@@ -6,9 +6,11 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"clearNotification": "Limpar Notificação",
 	"clearNotifications": "Limpar Todas as Notificações",
 	"hideNotificationsCenter": "Ocultar Notificações",
 	"expandNotification": "Expandir Notificação",
 	"collapseNotification": "Recolher Notificação",
-	"configureNotification": "Configurar Notificação"
+	"configureNotification": "Configurar Notificação",
+	"copyNotification": "Copiar Texto"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
index 9c950e41e29..02b9b9c0ccf 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"hideNotifications": "Ocultar Notificações"
+	"hideNotifications": "Ocultar Notificações",
+	"oneNotification": "1 Nova Notificação"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 38924568114..8fd73e4f40c 100644
--- a/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,8 +45,6 @@
 	"windowConfigurationTitle": "Janela",
 	"window.openFilesInNewWindow.on": "Arquivos serão abertos em uma nova janela",
 	"window.openFilesInNewWindow.off": "Arquivos serão abertos em uma nova janela com a pasta de arquivos aberta ou com a última janela ativa.",
-	"window.openFilesInNewWindow.default": "Os arquivos serão abertos na janela com a pasta de arquivos aberta ou a última janela ativa, a menos que seja aberto através do dock ou do finder (somente macOS)",
-	"openFilesInNewWindow": "Controla se os arquivos devem ser abertos em uma nova janela\n- padrão: os arquivos serão abertos em uma nova janela com a pasta de arquivos aberta ou na última janela ativa, a menos que seja aberta através do dock ou do finder (apenas macOS)\n- ligado: os arquivos serão abertos em uma nova janela\n- desligado: os arquivos serão abertos em uma janela com a pasta de arquivos aberta ou a última janela ativa\nNote que ainda podem haver casos em que esta configuração será ignorada (por exemplo, quando estiver usando as opções de linha de comando -new-window ou -reuse-window).",
 	"window.openFoldersInNewWindow.on": "As pastas serão abertas em uma nova janela",
 	"window.openFoldersInNewWindow.off": "As pastas substituirão a última janela ativa",
 	"window.openFoldersInNewWindow.default": "As pastas serão abertas em uma nova janela, a menos que uma pasta seja selecionada dentro do aplicativo (por exemplo, através do menu Arquivo)",
@@ -58,7 +56,6 @@
 	"restoreWindows": "Controla como as janelas serão reabertas após uma reinicialização. Selecione 'nenhum' para sempre iniciar com uma área de trabalho vazia, 'um' para reabrir a última janela que você trabalhou, 'pastas' para reabrir todas as janelas que tinham pastas abertas ou 'todos' para reabrir todas as janelas da sua última sessão.",
 	"restoreFullscreen": "Controla se uma janela deve ser restaurada em modo de tela cheia se ela foi finalizada em modo de tela cheia.",
 	"zoomLevel": "Ajusta o nível de zoom da janela. O tamanho original é 0 e cada aumento (por exemplo, 1) ou redução (por exemplo, -1) representa um zoom 20% maior ou menor. Você também pode digitar decimais para ajustar o nível de zoom com uma granularidade mais fina.",
-	"title": "Controla o título de janela baseado no editor ativo. Variáveis são substituídas com base no contexto: \n${activeEditorShort}: o nome do arquivo (por exemplo, MyFile txt)\n${activeEditorMedium}: o caminho do arquivo relativo à pasta da área de trabalho (por exemplo, myFolder/myFile.txt) \n${activeEditorLong}: o caminho completo do arquivo (por exemplo, /Users/Development/myProject/myFolder/myFile.txt) \n${folderName}: nome da pasta de trabalho em que o arquivo está contido (por exemplo, myFolder) \n${folderPath}: caminho do arquivo da pasta de trabalho em que o arquivo está contido (por exemplo, /Users/Development/myFolder) {\n$(rootName}: nome do espaço de trabalho (por exemplo, myFolder ou myWorkspace)\n${rootPath}: caminho do espaço de trabalho (por exemplo, /Users/Development/myWorkspace) \n${appName}: por exemplo, VS Code\n${dirty}: um indicador se o editor ativo foi modificado\n${separator}: um separador condicional (\"-\") que é mostrado apenas quando cercado por variáveis com valores",
 	"window.newWindowDimensions.default": "Abrir novas janelas no centro da tela.",
 	"window.newWindowDimensions.inherit": "Abrir novas janelas com a mesma dimensão da última janela ativa.",
 	"window.newWindowDimensions.maximized": "Abrir novas janelas maximizadas.",
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index fae5e7689d0..e3be93ecafc 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -10,6 +10,7 @@
 	"functionBreakpointsNotSupported": "Pontos de parada de função não são suportados por este tipo de depuração",
 	"functionBreakpointPlaceholder": "Função de parada",
 	"functionBreakPointInputAriaLabel": "Digitar Ponto de Parada de Função",
+	"breakpointDisabledHover": "Ponto de interrupção desativado",
 	"breakpointDirtydHover": "Ponto de parada não verificado. O arquivo foi modificado, por favor reinicie a sessão de depuração.",
 	"conditionalBreakpointUnsupported": "Pontos de parada condicionais não são suportados por esse tipo de depurador"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 734a4f0737e..7bffbd36c2c 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Reiniciar o Frame",
 	"removeBreakpoint": "Remover Ponto de Parada",
 	"removeAllBreakpoints": "Remover Todos os Pontos de Parada",
-	"enableBreakpoint": "Habilitar ponto de Parada",
-	"disableBreakpoint": "Desativar Ponto de Parada",
 	"enableAllBreakpoints": "Habilitar Todos os Pontos de Parada",
 	"disableAllBreakpoints": "Desabilitar Todos Pontos de Parada",
 	"activateBreakpoints": "Ativar Pontos de Parada",
 	"deactivateBreakpoints": "Desativar Pontos de Parada",
 	"reapplyAllBreakpoints": "Reaplicar Todos os Pontos de Parada",
 	"addFunctionBreakpoint": "Adicionar Ponto de Parada de Função",
-	"addConditionalBreakpoint": "Adicionar Ponto de Parada Condicional...",
-	"editConditionalBreakpoint": "Editar o Ponto de Parada...",
 	"setValue": "Definir Valor",
 	"addWatchExpression": "Adicionar Expressão",
 	"editWatchExpression": "Editar expressão",
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..e3644af4287
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Parar quando contagem de ocorrências condição for alcançada. 'Enter' para aceitar, 'esc' para cancelar.",
+	"breakpointWidgetExpressionPlaceholder": "Parar quando a expressão for avaliada como true. 'Enter' para aceitar, 'esc' para cancelar.",
+	"breakpointWidgetHitCountAriaLabel": "O programa só vai parar aqui, se a contagem de ocorrências for alcançada. Pressione Enter para aceitar ou Escape para cancelar.",
+	"breakpointWidgetAriaLabel": "O programa só vai parar aqui se esta condição for verdadeira. Pressione Enter para aceitar ou Escape para cancelar.",
+	"expression": "Expressão",
+	"hitCount": "Contagem de ocorrências"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index e6cb3550cab..1a2d0c2dbfa 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -26,5 +26,6 @@
 	"always": "Sempre mostrar depurar na barra de status",
 	"onFirstSessionStart": "Mostrar depurar na barra de status somente após a depuração ser iniciada pela primeira vez",
 	"showInStatusBar": "Controla quando a barra de status de depuração deve ser visível",
+	"openDebug": "Controla se a visualização de depuração deve ser aberta no início da sessão de depuração.",
 	"launch": "Configuração global do lançamento do depurador. Deve ser usado como uma alternativa para o arquivo 'launch.json' que é compartilhado entre os espaços de trabalho"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 60374cdddc8..0f414408390 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Editar o Ponto de Parada...",
+	"disableBreakpoint": "Desativar Ponto de Parada",
+	"enableBreakpoint": "Habilitar ponto de Parada",
 	"removeBreakpoints": "Remover pontos de interrupção",
 	"removeBreakpointOnColumn": "Remover ponto de interrupção na coluna {0}",
 	"removeLineBreakpoint": "Remover ponto de interrupção de linha",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "Habilitar o ponto de interrupção na coluna {0}",
 	"enableBreakpointOnLine": "Habilitar o ponto de interrupção de linha",
 	"addBreakpoint": "Adicionar ponto de interrupção",
+	"conditionalBreakpoint": "Adicionar Ponto de Parada Condicional...",
 	"addConfiguration": "Adicionar Configuração..."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 54e30c2ab6b..a29d2cb2439 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -26,7 +26,5 @@
 	"preLaunchTaskExitCode": "A preLaunchTask '{0}' encerrada com código de saída {1}.",
 	"showErrors": "Mostrar erros",
 	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
-	"cancel": "Cancelar",
-	"DebugTaskNotFound": "Não foi possível encontrar o preLaunchTask '{0}'.",
-	"taskNotTracked": "Tarefa de pré-lançamento ${0} não pode ser rastreada."
+	"cancel": "Cancelar"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
index 02bb00f9f6c..549e00ee363 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copyValue": "Copiar valor",
+	"copyAsExpression": "Copiar como Expressão",
 	"copy": "Copiar",
 	"copyAll": "Copiar todos",
 	"copyStackTrace": "Copiar Pilha de Chamadas"
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..c50dddb3166
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,53 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Nome da extensão",
+	"extension id": "Identificador da extensão",
+	"preview": "Visualizar",
+	"builtin": "Intrínseco",
+	"publisher": "Nome do editor",
+	"install count": "Quantidade de Instalações",
+	"rating": "Avaliação",
+	"license": "Licença",
+	"details": "Detalhes",
+	"contributions": "Contribuições",
+	"changelog": "Registro de Alterações",
+	"dependencies": "Dependências",
+	"noReadme": "README não disponível.",
+	"noChangelog": "Registro de Alterações não disponível.",
+	"noContributions": "Sem Contribuições",
+	"noDependencies": "Sem Dependências",
+	"settings": "Configurações ({0})",
+	"setting name": "Nome",
+	"description": "Descrição",
+	"default": "Valor padrão",
+	"debuggers": "Depuradores ({0})",
+	"debugger name": "Nome",
+	"debugger type": "Tipo",
+	"views": "Visualizações ({0})",
+	"view id": "ID",
+	"view name": "Nome",
+	"view location": "Onde",
+	"localizations language id": "Id do Idioma",
+	"localizations language name": "Nome do Idioma",
+	"localizations localized language name": "Nome do Idioma (Localizado)",
+	"colorId": "Id",
+	"defaultDark": "Padrão Escuro",
+	"defaultLight": "Padrão Claro",
+	"JSON Validation": "Validação JSON ({0})",
+	"commands": "Comandos ({0})",
+	"command name": "Nome",
+	"keyboard shortcuts": "Atalhos de Teclado",
+	"menuContexts": "Contextos de Menu",
+	"languages": "Linguagens ({0})",
+	"language id": "ID",
+	"language name": "Nome",
+	"file extensions": "Extensões de Arquivo",
+	"grammar": "Gramática",
+	"snippets": "Trechos"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 4f398630432..963936e2ac1 100644
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "Recomendado",
 	"otherRecommendedExtensions": "Outras recomendações",
 	"workspaceRecommendedExtensions": "Recomendações do Espaço de Trabalho",
-	"builtInExtensions": "Incorporado",
 	"searchExtensions": "Pesquisar Extensões na Loja",
 	"sort by installs": "Ordenar por: Quantidade de Instalações",
 	"sort by rating": "Ordenar por: Avaliação",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 209ded70473..d626a3f28d4 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,11 @@
 	"confirmMoveTrashMessageMultiple": "Você tem certeza que deseja excluir os seguintes {0} arquivos?",
 	"confirmMoveTrashMessageFolder": "Tem certeza de que deseja excluir '{0}' e seu conteúdo?",
 	"confirmMoveTrashMessageFile": "Tem certeza de que deseja excluir '{0}'?",
-	"undoBin": "Você pode restaurar da lixeira.",
-	"undoTrash": "Você pode restaurar a partir do lixo.",
 	"doNotAskAgain": "Não me pergunte novamente",
 	"confirmDeleteMessageMultiple": "Você tem certeza que deseja excluir permanentemente os seguintes {0} arquivos?",
 	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
 	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
 	"irreversible": "Esta ação é irreversível!",
-	"cancel": "Cancelar",
-	"permDelete": "Excluir permanentemente",
 	"importFiles": "Importar Arquivos",
 	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
 	"replaceButtonLabel": "&&Substituir",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
index e38036e8255..e4ceea553e3 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"openEditors": "Abrir Editores",
+	"openEditors": "Editores Abertos",
 	"openEditosrSection": "Abrir Seção de Editores",
 	"dirtyCounter": "{0} não salvos"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..2f618f306d5
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "Visualização Html"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..478273f97f8
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "Entrada inválida do editor."
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..1bdb832ea43
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Desenvolvedor"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..c9dceaeb492
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"refreshWebviewLabel": "Recarregar Webviews"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index a43dc690778..1148faff8d9 100644
--- a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "Sim",
+	"no": "Não",
+	"doNotAskAgain": "Não me pergunte novamente",
 	"JsonSchema.locale": "O idioma da interface do usuário a ser usada.",
 	"vscode.extension.contributes.localizations": "Contribui localizações ao editor",
 	"vscode.extension.contributes.localizations.languageId": "Id do idioma em que as strings de exibição estão traduzidas.",
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..a285e05a853
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Copiar",
+	"copyMarkerMessage": "Copiar Mensagem"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..b5d8f47647e
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Total {0} Problemas",
+	"filteredProblems": "Mostrando {0} de {1} Problemas"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..4af5054b913
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "Problemas",
+	"tooltip.1": "1 problema neste arquivo",
+	"tooltip.N": "{0} problemas neste arquivo"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..9997fe77588
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Exibir",
+	"problems.view.toggle.label": "Esconder/exibir Problemas (Erros, Avisos, Infos)",
+	"problems.view.focus.label": "Focar Problemas (Erros, Avisos, Infos)",
+	"problems.panel.configuration.title": "Visualização de Problemas",
+	"problems.panel.configuration.autoreveal": "Controla se a visaulização de problemas evela os arquivos automaticamente ao abri-los",
+	"markers.panel.title.problems": "Problemas",
+	"markers.panel.aria.label.problems.tree": "Problemas agrupados por arquivos",
+	"markers.panel.no.problems.build": "Nenhum problema foi detectado na área de trabalho até agora.",
+	"markers.panel.no.problems.filters": "Nenhum resultado encontrado com os critérios de filtro fornecidos",
+	"markers.panel.action.filter": "Problemas de Filtro",
+	"markers.panel.filter.placeholder": "Filtrar por tipo ou texto",
+	"markers.panel.filter.errors": "erros",
+	"markers.panel.filter.warnings": "avisos",
+	"markers.panel.filter.infos": "informações",
+	"markers.panel.single.error.label": "1 Erro",
+	"markers.panel.multiple.errors.label": "{0} Erros",
+	"markers.panel.single.warning.label": "1 Aviso",
+	"markers.panel.multiple.warnings.label": "{0} Avisos",
+	"markers.panel.single.info.label": "1 Informação",
+	"markers.panel.multiple.infos.label": "{0} Informações",
+	"markers.panel.single.unknown.label": "1 Desconhecido",
+	"markers.panel.multiple.unknowns.label": "{0} Desconhecidos",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} com {1} problemas",
+	"errors.warnings.show.label": "Mostrar Erros e Avisos"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index c8466a5d8cf..71d77d2ad9b 100644
--- a/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Alternar Saída",
 	"clearOutput": "Limpar saída",
 	"toggleOutputScrollLock": "Alternar Scroll Lock de Saída",
-	"switchToOutput.label": "Mudar para Saída"
+	"switchToOutput.label": "Mudar para Saída",
+	"openInLogViewer": "Abrir Arquivo de Log"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index a7ff00a96e8..c8a848c68bd 100644
--- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -9,7 +9,6 @@
 	"scm providers": "Provedores de Controle de Código Fonte",
 	"hideRepository": "Ocultar",
 	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
-	"no open repo": "Não existem provedores controle de código fonte ativos.",
 	"source control": "Controle de código-fonte",
 	"viewletTitle": "{0}: {1}"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 31c522acb51..ddfd526d730 100644
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Mostrar a Próxima Busca Incluindo Padrões",
 	"previousSearchIncludePattern": "Mostrar a Busca Anterior Incluindo Padrões",
-	"nextSearchExcludePattern": "Mostrar a Próxima Busca Excluindo Padrões",
-	"previousSearchExcludePattern": "Mostrar a Busca Anterior Excluindo Padrões",
 	"nextSearchTerm": "Mostrar o Próximo Termo de Pesquisa",
 	"previousSearchTerm": "Mostrar Termo de Pesquisa Anterior",
 	"showSearchViewlet": "Mostrar Busca",
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
index 5f837d2145a..213e59f2810 100644
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Alternar Detalhes da Pesquisa",
-	"searchScope.includes": "arquivos a serem incluídos",
-	"label.includes": "Pesquisa Padrões de Inclusão",
-	"searchScope.excludes": "arquivos a serem excluídos",
-	"label.excludes": "Pesquisa de Padrões de Exclusão",
+	"searchIncludeExclude.label": "arquivos para incluir/excluir",
 	"replaceAll.confirmation.title": "Substituir Tudo",
 	"replaceAll.confirm.button": "&&Substituir",
 	"replaceAll.occurrence.file.message": "Substituída {0} ocorrência no arquivo {1} com '{2}'.",
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 36d63910548..7cef3aef4bd 100644
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "Atribui a tarefa para nenhum grupo",
 	"JsonSchema.tasks.group": "Define a que grupo de execução desta tarefa pertence. Suporta \"build\" para adicioná-lo ao grupo de compilação e \"test\" para adicioná-lo ao grupo de teste.",
 	"JsonSchema.tasks.type": "Define quando a tarefa é executada como um processo ou como um comando dentro do shell.",
+	"JsonSchema.command": "O comando a ser executado. Pode ser um programa externo ou um comando shell.",
+	"JsonSchema.tasks.args": "Argumentos passados para o comando quando esta tarefa é invocada.",
 	"JsonSchema.tasks.label": "O rótulo da tarefa na interface do usuário.",
 	"JsonSchema.version": "O número da versão do config.",
 	"JsonSchema.tasks.identifier": "Um identificador definido pelo usuário para fazer referência a tarefa em launch.json ou uma cláusula dependsOn.",
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 98ac71f39a9..739fd01f6dd 100644
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,11 @@
 	],
 	"tasksCategory": "Tarefas",
 	"ConfigureTaskRunnerAction.label": "Configurar a tarefa",
-	"problems": "Problemas",
+	"totalErrors": "{0} Erros",
+	"totalWarnings": "{0} Avisos",
+	"totalInfos": "{0} Informações",
 	"building": "Compilando...",
-	"manyMarkers": "99+",
+	"manyProblems": "10K+",
 	"runningTasks": "Mostrar tarefas em execução",
 	"tasks": "Tarefas",
 	"TaskSystem.noHotSwap": "Alterar o mecanismo de execução da tarefa com uma tarefa ativa executando exige que a janela seja recarregada",
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 910bec85134..2b141ba44a3 100644
--- a/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Erro: a configuração de tarefa '{0}' não possui a propriedade obrigatória '{1}'. A configuração de tarefa será ignorada.",
 	"ConfigurationParser.notCustom": "Erro: tarefas não está declarada como uma tarefa personalizada. A configuração será ignorada.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Erro: uma tarefa deve fornecer uma propriedade de rótulo. A tarefa será ignorada.\n{0}\n",
-	"taskConfiguration.shellArgs": "Aviso: a tarefa '{0}' é um comando shell e um dos seus argumentos pode ter espaços sem escape. Para garantir a citação da linha de comando correta por favor mesclar args ao comando.",
 	"taskConfiguration.noCommandOrDependsOn": "Erro: a tarefa '{0}' não especifica nem um comando nem uma propriedade dependsOn. A tarefa será ignorada. Sua definição é: \n{1}",
 	"taskConfiguration.noCommand": "Erro: a tarefa '{0}' não define um comando. A tarefa será ignorada. Sua definição é: {1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Tarefa versão 2.0.0 não oferece suporte a tarefas globais específicas do sistema operacional. Converta-as em uma tarefa com um comando específico do sistema operacional. Tarefas afetadas:\n{0}"
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 725f78f2307..dbdfa88d94b 100644
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copiar",
+	"split": "Dividir",
 	"paste": "Colar",
 	"selectAll": "Selecionar Tudo",
-	"clear": "Limpar",
-	"split": "Dividir"
+	"clear": "Limpar"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..4290f9be0ba
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Notas da Versão: {0}",
+	"unassigned": "Não atribuído"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 5847a090e0c..6b7eb5e33c4 100644
--- a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "Mais tarde",
-	"unassigned": "Não atribuído",
 	"releaseNotes": "Notas da Versão",
 	"showReleaseNotes": "Mostrar Notas da Versão",
 	"read the release notes": "Bem-vindo a {0} v{1}! Gostaria de ler as Notas da Versão?",
diff --git a/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..4498984aac3
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "editor webview"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..960ae0c5c98
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "Ler Mais"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..7fbcc0a8081
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Sim",
+	"cancelButton": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 45f49e07241..36971b11ff8 100644
--- a/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,6 @@
 	"neverShowAgain": "Não mostrar novamente",
 	"netVersionError": "O Microsoft .NET Framework 4.5 é necessário. Por favor siga o link para instalá-lo.",
 	"learnMore": "Instruções",
-	"enospcError": "{0} está ficando sem tratamento de arquivos. Por favor, siga o link de instruções para resolver esse problema.",
 	"binFailed": "Falha ao mover '{0}' para a lixeira",
 	"trashFailed": "Falha em mover '{0}' para a lixeira"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
index 37fbb011a3d..29bfbb0d040 100644
--- a/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Recurso de arquivo inválido ({0})",
 	"fileIsDirectoryError": "Arquivo é um diretório",
 	"fileNotModifiedError": "Arquivo não modificado desde",
-	"fileTooLargeForHeapError": "O tamanho do arquivo excede o limite de memória da janela. Por favor, tente executar o codigo -max-memory=NOVOVALOR",
 	"fileTooLargeError": "Arquivo muito grande para abrir",
 	"fileNotFoundError": "Arquivo não encontrado ({0})",
 	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
diff --git a/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..10f4afca07b 100644
--- a/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Cancelar"
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..01ee817cdcd
--- /dev/null
+++ b/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "Языковой сервер CSS",
+	"folding.start": "Начало сворачиваемого региона",
+	"folding.end": "Окончание сворачиваемого региона"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css-language-features/package.i18n.json b/i18n/rus/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..c5c8a90070b
--- /dev/null
+++ b/i18n/rus/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,80 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Возможности языка CSS",
+	"description": "Предоставляет широкую поддержку языка для файлов CSS, LESS и SCSS.",
+	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
+	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
+	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
+	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
+	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
+	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
+	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
+	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
+	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
+	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
+	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
+	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
+	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
+	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
+	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
+	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
+	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
+	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
+	"css.validate.desc": "Включает или отключает все проверки",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
+	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
+	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
+	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
+	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
+	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
+	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
+	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
+	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
+	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
+	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
+	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
+	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
+	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
+	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
+	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
+	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
+	"less.validate.desc": "Включает или отключает все проверки",
+	"scss.title": "SCSS (SASS)",
+	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
+	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
+	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
+	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
+	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
+	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
+	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
+	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
+	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
+	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
+	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
+	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
+	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
+	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
+	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
+	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
+	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
+	"scss.validate.desc": "Включает или отключает все проверки",
+	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
+	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
+	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css/package.i18n.json b/i18n/rus/extensions/css/package.i18n.json
index a4d164c6122..35229bd6699 100644
--- a/i18n/rus/extensions/css/package.i18n.json
+++ b/i18n/rus/extensions/css/package.i18n.json
@@ -5,77 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Возможности языка CSS",
-	"description": "Предоставляет широкую поддержку языка для файлов CSS, LESS и SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
-	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
-	"css.validate.desc": "Включает или отключает все проверки",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
-	"less.validate.desc": "Включает или отключает все проверки",
-	"scss.title": "SCSS (SASS)",
-	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
-	"scss.validate.desc": "Включает или отключает все проверки",
-	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
+	]
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/commands.i18n.json b/i18n/rus/extensions/git/out/commands.i18n.json
index ef93bfa4e37..5e347fa36d0 100644
--- a/i18n/rus/extensions/git/out/commands.i18n.json
+++ b/i18n/rus/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "ОК",
 	"push with tags success": "Файлы с тегами успешно отправлены.",
 	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
 	"never again": "ОК, больше не показывать",
 	"no remotes to publish": "Для вашего репозитория не настроены удаленные репозитории для публикации.",
 	"no changes stash": "Отсутствуют изменения, которые необходимо спрятать.",
diff --git a/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..113482bb267
--- /dev/null
+++ b/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "Языковой сервер HTML",
+	"folding.start": "Начало сворачиваемого региона",
+	"folding.end": "Окончание сворачиваемого региона"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html-language-features/package.i18n.json b/i18n/rus/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..ffedf2c26a3
--- /dev/null
+++ b/i18n/rus/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Возможности языка HTML",
+	"description": "Предоставляет широкую поддержку языка для файлов HTML, Razor и Handlebar.",
+	"html.format.enable.desc": "Включить/отключить модуль форматирования HTML по умолчанию",
+	"html.format.wrapLineLength.desc": "Максимальное число символов на строку (0 — отключить).",
+	"html.format.unformatted.desc": "Список тегов, которые не следует повторно форматировать, с разделителями-запятыми. Значение \"NULL\" по умолчанию означает все теги, перечисленные на странице https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Разделенный запятыми список тегов, в которых формат содержимого не должен изменяться. Значение null задается по умолчанию для тега pre.",
+	"html.format.indentInnerHtml.desc": "Отступ в разделах <head> и <body>.",
+	"html.format.preserveNewLines.desc": "Следует ли сохранять разрывы строк перед элементами. Работает только перед элементами, а не внутри тегов или для текста.",
+	"html.format.maxPreserveNewLines.desc": "Максимальное число разрывов строк для сохранения в блоке. Чтобы указать неограниченное число строк, используйте \"null\".",
+	"html.format.indentHandlebars.desc": "Формат и отступ {{#foo}} и {{/foo}}.",
+	"html.format.endWithNewline.desc": "Завершение символом новой строки.",
+	"html.format.extraLiners.desc": "Список тегов с разделителями-запятыми и дополнительными новыми строками между ними. Значение \"null\" по умолчанию ставится для \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Перенос атрибутов.",
+	"html.format.wrapAttributes.auto": "Перенос атрибутов только при превышении длины строки.",
+	"html.format.wrapAttributes.force": "Перенос всех атрибутов, кроме первого.",
+	"html.format.wrapAttributes.forcealign": "Перенос всех атрибутов, кроме первого, и сохранение выравнивания.",
+	"html.format.wrapAttributes.forcemultiline": "Перенос всех атрибутов.",
+	"html.suggest.angular1.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги и свойства Angular 1.",
+	"html.suggest.ionic.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения Ionic.",
+	"html.suggest.html5.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения HTML5.",
+	"html.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером HTML. ",
+	"html.validate.scripts": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные сценарии.",
+	"html.validate.styles": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные стили.",
+	"html.autoClosingTags": "Включить или отключить автоматическое закрытие тегов HTML. "
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html/package.i18n.json b/i18n/rus/extensions/html/package.i18n.json
index 97846bbda84..35229bd6699 100644
--- a/i18n/rus/extensions/html/package.i18n.json
+++ b/i18n/rus/extensions/html/package.i18n.json
@@ -5,30 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Возможности языка HTML",
-	"description": "Предоставляет широкую поддержку языка для файлов HTML, Razor и Handlebar.",
-	"html.format.enable.desc": "Включить/отключить модуль форматирования HTML по умолчанию",
-	"html.format.wrapLineLength.desc": "Максимальное число символов на строку (0 — отключить).",
-	"html.format.unformatted.desc": "Список тегов, которые не следует повторно форматировать, с разделителями-запятыми. Значение \"NULL\" по умолчанию означает все теги, перечисленные на странице https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Разделенный запятыми список тегов, в которых формат содержимого не должен изменяться. Значение null задается по умолчанию для тега pre.",
-	"html.format.indentInnerHtml.desc": "Отступ в разделах <head> и <body>.",
-	"html.format.preserveNewLines.desc": "Следует ли сохранять разрывы строк перед элементами. Работает только перед элементами, а не внутри тегов или для текста.",
-	"html.format.maxPreserveNewLines.desc": "Максимальное число разрывов строк для сохранения в блоке. Чтобы указать неограниченное число строк, используйте \"null\".",
-	"html.format.indentHandlebars.desc": "Формат и отступ {{#foo}} и {{/foo}}.",
-	"html.format.endWithNewline.desc": "Завершение символом новой строки.",
-	"html.format.extraLiners.desc": "Список тегов с разделителями-запятыми и дополнительными новыми строками между ними. Значение \"null\" по умолчанию ставится для \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Перенос атрибутов.",
-	"html.format.wrapAttributes.auto": "Перенос атрибутов только при превышении длины строки.",
-	"html.format.wrapAttributes.force": "Перенос всех атрибутов, кроме первого.",
-	"html.format.wrapAttributes.forcealign": "Перенос всех атрибутов, кроме первого, и сохранение выравнивания.",
-	"html.format.wrapAttributes.forcemultiline": "Перенос всех атрибутов.",
-	"html.suggest.angular1.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги и свойства Angular 1.",
-	"html.suggest.ionic.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения Ionic.",
-	"html.suggest.html5.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения HTML5.",
-	"html.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером HTML. ",
-	"html.validate.scripts": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные сценарии.",
-	"html.validate.styles": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные стили.",
-	"html.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
-	"html.autoClosingTags": "Включить или отключить автоматическое закрытие тегов HTML. "
+	]
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..ae46a81e4e9
--- /dev/null
+++ b/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "Языковой сервер JSON"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json-language-features/package.i18n.json b/i18n/rus/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..762d0d1b54d
--- /dev/null
+++ b/i18n/rus/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"description": "Предоставляет широкую поддержку языка для файлов JSON.",
+	"json.schemas.desc": "Связь схем с JSON-файлами в текущем проекте",
+	"json.schemas.url.desc": "URL-адрес схемы или относительный путь к ней в текущем каталоге",
+	"json.schemas.fileMatch.desc": "Массив шаблонов файлов, с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
+	"json.schemas.fileMatch.item.desc": "Шаблон файла, который может содержать \"*\" и с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
+	"json.schemas.schema.desc": "Определение схемы для указанного URL-адреса. Схему необходимо указать только для того, чтобы не обращаться по URL-адресу схемы.",
+	"json.format.enable.desc": "Включение или отключение модуля форматирования JSON по умолчанию (требуется перезагрузка)",
+	"json.tracing.desc": "Отслеживает связь между VS Code и языковым сервером JSON.",
+	"json.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"json.colorDecorators.enable.deprecationMessage": "Параметр \"json.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\"."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json/package.i18n.json b/i18n/rus/extensions/json/package.i18n.json
index 5b4b6d24cfd..35229bd6699 100644
--- a/i18n/rus/extensions/json/package.i18n.json
+++ b/i18n/rus/extensions/json/package.i18n.json
@@ -5,17 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"displayName": "Возможности языка JSON",
-	"description": "Предоставляет широкую поддержку языка для файлов JSON.",
-	"json.schemas.desc": "Связь схем с JSON-файлами в текущем проекте",
-	"json.schemas.url.desc": "URL-адрес схемы или относительный путь к ней в текущем каталоге",
-	"json.schemas.fileMatch.desc": "Массив шаблонов файлов, с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-	"json.schemas.fileMatch.item.desc": "Шаблон файла, который может содержать \"*\" и с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-	"json.schemas.schema.desc": "Определение схемы для указанного URL-адреса. Схему необходимо указать только для того, чтобы не обращаться по URL-адресу схемы.",
-	"json.format.enable.desc": "Включение или отключение модуля форматирования JSON по умолчанию (требуется перезагрузка)",
-	"json.tracing.desc": "Отслеживает связь между VS Code и языковым сервером JSON.",
-	"json.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"json.colorDecorators.enable.deprecationMessage": "Параметр \"json.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\".",
-	"json.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса."
+	]
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..b4a71726277
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "Не удалось загрузить 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..e3a2c915436
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/features/preview.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."
+	],
+	"lockedPreviewTitle": "[Предварительный просмотр] {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..01fb924a326
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "Некоторое содержимое в этом документе было отключено",
+	"preview.securityMessage.title": "В предварительном просмотре Markdown было отключено потенциально опасное или ненадежное содержимое. Чтобы разрешить ненадежное содержимое или включить сценарии, измените параметры безопасности предварительного просмотра Markdown.",
+	"preview.securityMessage.label": "Предупреждение безопасности об отключении содержимого"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/security.i18n.json b/i18n/rus/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..0cab268e7a8
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.description": "Загружать только безопасное содержимое",
+	"insecureContent.title": "Разрешить небезопасное содержимое",
+	"insecureContent.description": "Включить загрузку содержимого через HTTP",
+	"disable.title": "Отключить",
+	"disable.description": "Разрешить все содержимое и выполнение сценариев. Не рекомендуется",
+	"moreInfo.title": "Дополнительные сведения",
+	"enableSecurityWarning.title": "Включить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
+	"disableSecurityWarning.title": "Отключить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
+	"toggleSecurityWarning.description": "Не влияет на уровень безопасности содержимого",
+	"preview.showPreviewSecuritySelector.title": "Установите параметры безопасности для предварительного просмотра Markdown в этой рабочей области"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/package.i18n.json b/i18n/rus/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..021c2c0fa8c
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,31 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"description": "Предоставляет широкую поддержку языка для Markdown.",
+	"markdown.preview.breaks.desc": "Определяет, как переносы строк отображаются в области предварительного просмотра файла Markdown. Если установить этот параметр в значение 'true', <br>будут создаваться для каждой новой строки.",
+	"markdown.preview.linkify": "Включить или отключить преобразование текста в URL для предварительного просмотра Markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Двойной щелчок в области предварительного просмотра Markdown в редакторе.",
+	"markdown.preview.fontFamily.desc": "Определяет семейство шрифтов, используемое в области предварительного просмотра файла Markdown.",
+	"markdown.preview.fontSize.desc": "Определяет размер шрифта (в пикселях), используемый в области предварительного просмотра файла Markdown.",
+	"markdown.preview.lineHeight.desc": "Определяет высоту строки, используемую в области предварительного просмотра файла Markdown. Это значение задается относительно размера шрифта.",
+	"markdown.preview.markEditorSelection.desc": "Выделение выбранного в текущем редакторе в предпросмотре Markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Обновить представление редактора при прокрутке предварительного просмотра Markdown.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Обновить представление предварительного просмотра при прокрутке редактора Markdown.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Устаревшая функция] Прокрутка предварительного просмотра Markdown до выбранной строки в редакторе.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Этот параметр был заменен на 'markdown.preview.scrollPreviewWithEditor' и больше не используется.",
+	"markdown.preview.title": "Открыть область предварительного просмотра",
+	"markdown.previewFrontMatter.dec": "Определяет обработку титульных листов YAML в области предварительного просмотра файла Markdown. Значение \"скрыть\" удаляет титульные листы. В противном случае титульные листы обрабатываются как содержимое файла Markdown.",
+	"markdown.previewSide.title": "Открыть область предварительного просмотра сбоку",
+	"markdown.showLockedPreviewToSide.title": "Открыть заблокированную область предварительного просмотра сбоку",
+	"markdown.showSource.title": "Показать источник",
+	"markdown.styles.dec": "Список URL-адресов или локальных путей к таблицам стилей CSS, используемых из области предварительного просмотра файла Markdown. Относительные пути интерпретируются относительно папки, открытой в проводнике. Если папка не открыта, они интерпретируются относительно расположения файла Markdown. Все символы '\\' должны записываться в виде '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Изменить параметры безопасности для предварительного просмотра",
+	"markdown.trace.desc": "Включить ведение журнала отладки для расширения Markdown.",
+	"markdown.preview.refresh.title": "Обновить область предварительного просмотра",
+	"markdown.preview.toggleLock.title": "Включить/отключить блокировку области предварительного просмотра"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..5696440e52e
--- /dev/null
+++ b/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "Разрешить выполнять {0} (определяется как параметр рабочей области) для обработки PHP-файлов через lint?",
+	"php.yes": "Разрешить",
+	"php.no": "Запретить",
+	"wrongExecutable": "Не удается проверить, так как {0} не является допустимым исполняемым PHP-файлом. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
+	"noExecutable": "Не удается проверить, так как не задан исполняемый PHP-файл. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
+	"unknownReason": "Не удалось запустить PHP-файл, используя путь {0}. Причина неизвестна."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php-language-features/package.i18n.json b/i18n/rus/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..e520e862551
--- /dev/null
+++ b/i18n/rus/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Указывает, включены ли встроенные языковые предложения для PHP. Поддержка предлагает глобальные значения и переменные PHP.",
+	"configuration.validate.enable": "Включение или отключение встроенной проверки PHP.",
+	"configuration.validate.executablePath": "Указывает на исполняемый файл PHP.",
+	"configuration.validate.run": "Запускается ли анализатор кода при сохранении или при печати.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Запретить исполняемый файл проверки PHP (определяется как параметр рабочей области)"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php/package.i18n.json b/i18n/rus/extensions/php/package.i18n.json
index c35bde05b3a..5e16df11f06 100644
--- a/i18n/rus/extensions/php/package.i18n.json
+++ b/i18n/rus/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Указывает, включены ли встроенные языковые предложения для PHP. Поддержка предлагает глобальные значения и переменные PHP.",
-	"configuration.validate.enable": "Включение или отключение встроенной проверки PHP.",
-	"configuration.validate.executablePath": "Указывает на исполняемый файл PHP.",
-	"configuration.validate.run": "Запускается ли анализатор кода при сохранении или при печати.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Запретить исполняемый файл проверки PHP (определяется как параметр рабочей области)",
-	"displayName": "Функции языка PHP",
-	"description": "Предоставляет IntelliSense, функции жанров и основные функции языка для файлов PHP."
+	"displayName": "Функции языка PHP"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 2c957229e71..36bef0368cd 100644
--- a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "Результаты не найдены",
 	"settingsSearchIssue": "Проблема с параметрами поиска",
 	"bugReporter": "Отчет об ошибках",
-	"performanceIssue": "Проблема с производительностью",
 	"featureRequest": "Запрос функции",
+	"performanceIssue": "Проблема с производительностью",
 	"stepsToReproduce": "Действия для воспроизведения проблемы",
 	"bugDescription": "Опишите действия для точного воспроизведения проблемы. Включите фактические и ожидаемые результаты. Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
 	"performanceIssueDesciption": "Когда возникла эта проблема с производительностью? Происходит ли она при запуске или после указанной серии действий? Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
diff --git a/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 4e38fa1d925..44453977d44 100644
--- a/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,6 @@
 	"warningBorder": "Цвет границ волнистой линии для выделения предупреждений в редакторе.",
 	"infoForeground": "Цвет волнистой линии для выделения информационных сообщений в редакторе.",
 	"infoBorder": "Цвет границ волнистой линии для выделения информационных сообщений в редакторе. ",
-	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов.",
 	"overviewRuleError": "Цвет метки линейки в окне просмотра для ошибок.",
 	"overviewRuleWarning": "Цвет метки линейки в окне просмотра для предупреждений.",
 	"overviewRuleInfo": "Цвет метки линейки в окне просмотра для информационных сообщений."
diff --git a/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 3bb2176af07..952cf41b7f5 100644
--- a/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Перейти к Следующей Проблеме (Ошибке, Предупреждению, Информации)",
-	"markerAction.previous.label": "Перейти к Предыдущей Проблеме (Ошибке, Предупреждению, Информации)",
-	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
+	"markerAction.previous.label": "Перейти к Предыдущей Проблеме (Ошибке, Предупреждению, Информации)"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..696263e5f65
--- /dev/null
+++ b/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
+	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
+	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
+	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 1d513afb117..89e24cb0c6f 100644
--- a/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,6 @@
 	"wordHighlightStrong": "Фон символа при доступе для записи, например при записи переменной. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
 	"wordHighlightBorder": "Цвет границы символа при доступе на чтение, например, при считывании переменной.",
 	"wordHighlightStrongBorder": "Цвет границы символа при доступе на запись, например, при записи переменной. ",
-	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.",
-	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ",
 	"wordHighlight.next.label": "Перейти к следующему выделению символов",
 	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..cd5317488f4
--- /dev/null
+++ b/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 дополнительный файл не показан",
+	"moreFiles": "...не показано дополнительных файлов: {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..a9e4b3696ae
--- /dev/null
+++ b/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "Отмена"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 2d37e3e2376..908048ebb5a 100644
--- a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,12 @@
 	"errorInstallingDependencies": "Ошибка при установке зависимостей. {0}",
 	"MarketPlaceDisabled": "Marketplace не включен",
 	"removeError": "Ошибка при удалении расширения: {0}. Закройте и снова откройте VS Code, затем повторите попытку.",
-	"Not Market place extension": "Повторно устанавливать можно только расширения из Marketplace",
 	"notFoundCompatible": "Невозможно установить '{0}'; нет версии, совместимой с VS Code '{1}'.",
 	"malicious extension": "Не удается установить расширение, так как оно помечено как проблемное.",
 	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
 	"quitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
 	"exitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
 	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
-	"uninstallOnly": "Только",
-	"uninstallAll": "Все",
 	"uninstallConfirmation": "Вы действительно хотите удалить \"{0}\"?",
 	"ok": "ОК",
 	"singleDependentError": "Не удается удалить расширение \"{0}\". От него зависит расширение \"{1}\".",
diff --git a/i18n/rus/src/vs/platform/markers/common/markers.i18n.json b/i18n/rus/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..eaeabe67095
--- /dev/null
+++ b/i18n/rus/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Ошибка",
+	"sev.warning": "Предупреждение",
+	"sev.info": "Сведения"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
index 7e411db1da2..4fd13e76a7a 100644
--- a/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -92,7 +92,5 @@
 	"mergeBorder": "Цвет границы заголовков и разделителя во внутренних конфликтах слияния.",
 	"overviewRulerCurrentContentForeground": "Цвет переднего плана линейки текущего окна во внутренних конфликтах слияния.",
 	"overviewRulerIncomingContentForeground": "Цвет переднего плана линейки входящего окна во внутренних конфликтах слияния.",
-	"overviewRulerCommonContentForeground": "Цвет переднего плана для обзорной линейки для общего предка во внутренних конфликтах слияния. ",
-	"overviewRulerFindMatchForeground": "Цвет метки линейки в окне просмотра для результатов поиска.",
-	"overviewRulerSelectionHighlightForeground": "Цвет метки линейки в окне просмотра для выделения."
+	"overviewRulerCommonContentForeground": "Цвет переднего плана для обзорной линейки для общего предка во внутренних конфликтах слияния. "
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 67fe147e873..99aca234c7b 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Фокус на следующую группу",
 	"openToSide": "Открыть сбоку",
 	"closeEditor": "Закрыть редактор",
+	"closeOneEditor": "Закрыть",
 	"revertAndCloseActiveEditor": "Отменить изменения и закрыть редактор",
 	"closeEditorsToTheLeft": "Закрыть редакторы слева",
 	"closeAllEditors": "Закрыть все редакторы",
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 1a90a14ced0..9d49f9d5c3c 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Закрыть",
 	"araLabelEditorActions": "Действия редактора"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
index cf76b9c9591..7a4ee2d7def 100644
--- a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,8 +45,6 @@
 	"windowConfigurationTitle": "Окно",
 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
 	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
-	"window.openFilesInNewWindow.default": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска (только macOS).",
-	"openFilesInNewWindow": "Определяет, будут ли файлы открываться в новом окне.\n- default: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска (только macOS).\n- on: файлы будут открываться в новом окне.\n- off: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
 	"window.openFoldersInNewWindow.on": "Папки будут открываться в новом окне.",
 	"window.openFoldersInNewWindow.off": "Папки будут заменять последнее активное окно.",
 	"window.openFoldersInNewWindow.default": "Папки будут открываться в новом окне, если папка не выбрана в приложении (например, в меню \"Файл\").",
@@ -58,7 +56,6 @@
 	"restoreWindows": "Управляет повторным открытием окон после перезапуска. Выберите 'none', чтобы всегда начинать с пустой рабочей области; 'one', чтобы открыть последнее окно, с которым вы работали; 'folders', чтобы открыть все окна с открытыми папками, и 'all', чтобы открыть все окна последнего сеанса.",
 	"restoreFullscreen": "Определяет, должно ли окно восстанавливаться в полноэкранном режиме, если оно было закрыто в полноэкранном режиме.",
 	"zoomLevel": "Настройте масштаб окна. Исходный размер равен 0. Увеличение или уменьшение значения на 1 означает увеличение или уменьшение окна на 20 %. Чтобы более точно задать масштаб, можно также ввести десятичное число.",
-	"title": "Определяет заголовок окна в зависимости от активного редактора. Подстановка переменных выполняется на основе контекста:\n${activeEditorShort}: имя файла (например, myFile.txt)\n${activeEditorMedium}: путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)\n${activeEditorLong}: полный путь к файлу (например, /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: имя папки рабочей области, в которой находится файл (например, myFolder)\n${folderPath}: путь к папке рабочей области, в которой находится файл (например, /Users/Development/myFolder)\n${rootName}: имя рабочей области (например, myFolder или myWorkspace)\n${rootPath}: путь к папке рабочей области (например, /Users/Development/myWorkspace)\n${appName}: например, VS Code\n${dirty}: индикатор изменения файла в активном редакторе\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями ",
 	"window.newWindowDimensions.default": "Открывать новые окна в центре экрана.",
 	"window.newWindowDimensions.inherit": "Открывать новые окна того же размера, что и последнее активное окно.",
 	"window.newWindowDimensions.maximized": "Открывать новые окна в развернутом состоянии.",
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index db465cf62cd..69f67e96d48 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Перезапустить кадр",
 	"removeBreakpoint": "Удалить точку останова",
 	"removeAllBreakpoints": "Удалить все точки останова",
-	"enableBreakpoint": "Включить точку останова",
-	"disableBreakpoint": "Выключить точку останова",
 	"enableAllBreakpoints": "Включить все точки останова",
 	"disableAllBreakpoints": "Отключить все точки останова",
 	"activateBreakpoints": "Активировать точки останова",
 	"deactivateBreakpoints": "Отключить точки останова",
 	"reapplyAllBreakpoints": "Повторно применить все точки останова",
 	"addFunctionBreakpoint": "Добавить точку останова в функции",
-	"addConditionalBreakpoint": "Добавить условную точку останова…",
-	"editConditionalBreakpoint": "Изменить точку останова…",
 	"setValue": "Задать значение",
 	"addWatchExpression": "Добавить выражение",
 	"editWatchExpression": "Изменить выражение",
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..93dc323939d
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
+	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
+	"breakpointWidgetHitCountAriaLabel": "Выполнение программы прервется в этом месте, только если достигнуто определенное количество обращений. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
+	"breakpointWidgetAriaLabel": "Выполнение программы прервется в этом месте, только если условие выполнится. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
+	"expression": "Выражение",
+	"hitCount": "Количество обращений"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index b73933c327a..a53c820ee79 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Изменить точку останова…",
+	"disableBreakpoint": "Выключить точку останова",
+	"enableBreakpoint": "Включить точку останова",
 	"removeBreakpoints": "Удалить точки останова",
 	"removeBreakpointOnColumn": "Удалить точку останова из столбца {0}",
 	"removeLineBreakpoint": "Удалить точку останова из строки",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "Включить точку останова в столбце {0}",
 	"enableBreakpointOnLine": "Включить точку останова в строке",
 	"addBreakpoint": "Добавить точку останова",
+	"conditionalBreakpoint": "Добавить условную точку останова…",
 	"addConfiguration": "Добавить конфигурацию..."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index fb28b2912a1..2f1cd08a60b 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -28,7 +28,5 @@
 	"preLaunchTaskExitCode": "Выполнение предварительной задачи \"{0}\" завершено с кодом выхода {1}.",
 	"showErrors": "Показывать ошибки",
 	"noFolderWorkspaceDebugError": "Нельзя выполнить отладку активного файла. Убедитесь, что файл сохранен на диске и установлено расширение отладки для этого типа файла.",
-	"cancel": "Отмена",
-	"DebugTaskNotFound": "Не удалось найти задачу preLaunchTask \"{0}\".",
-	"taskNotTracked": "Не удается отследить задачу предварительного запуска '{0}'."
+	"cancel": "Отмена"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..65c42dfa32b
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,54 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Имя расширения",
+	"extension id": "Идентификатор расширений",
+	"builtin": "Встроенное",
+	"publisher": "Имя издателя",
+	"install count": "Число установок",
+	"rating": "Оценка",
+	"license": "Лицензия",
+	"details": "Подробности",
+	"contributions": "Вклады",
+	"changelog": "Журнал изменений",
+	"dependencies": "Зависимости",
+	"noReadme": "Файл сведений недоступен.",
+	"noChangelog": "Журнал изменений недоступен.",
+	"noContributions": "Нет публикаций",
+	"noDependencies": "Нет зависимостей",
+	"settings": "Параметры ({0})",
+	"setting name": "Имя",
+	"description": "Описание",
+	"default": "По умолчанию",
+	"debuggers": "Отладчики ({0})",
+	"debugger name": "Имя",
+	"debugger type": "Тип",
+	"views": "Представления ({0})",
+	"view id": "Идентификатор",
+	"view name": "Имя",
+	"view location": "Где",
+	"localizations language id": "Идентификатор языка",
+	"localizations language name": "Название языка",
+	"localizations localized language name": "Название языка (локализованное)",
+	"iconThemes": "Темы значков ({0})",
+	"defaultDark": "Темная по умолчанию",
+	"defaultLight": "Светлая по умолчанию",
+	"defaultHC": "С высоким контрастом по умолчанию",
+	"JSON Validation": "Проверка JSON ({0})",
+	"fileMatch": "Сопоставление файла",
+	"commands": "Команды ({0})",
+	"command name": "Имя",
+	"keyboard shortcuts": "Сочетания клавиш",
+	"menuContexts": "Контексты меню",
+	"languages": "Языки ({0})",
+	"language id": "Идентификатор",
+	"language name": "Имя",
+	"file extensions": "Расширения файлов",
+	"grammar": "Грамматика",
+	"snippets": "Фрагменты"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index a5a34da17d1..fc2676c541b 100644
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "Рекомендуемое",
 	"otherRecommendedExtensions": "Другие рекомендации",
 	"workspaceRecommendedExtensions": "Рекомендации рабочей области",
-	"builtInExtensions": "Встроенный",
 	"searchExtensions": "Поиск расширений в Marketplace",
 	"sort by installs": "Сортировать по: числу установок",
 	"sort by rating": "Сортировать по: рейтинг",
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 6be9e343706..a22ecce0eb3 100644
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,11 @@
 	"confirmMoveTrashMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0})?",
 	"confirmMoveTrashMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое?",
 	"confirmMoveTrashMessageFile": "Вы действительно хотите удалить \"{0}\"?",
-	"undoBin": "Вы можете выполнить восстановление из корзины.",
-	"undoTrash": "Вы можете выполнить восстановление из корзины.",
 	"doNotAskAgain": "Больше не спрашивать",
 	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
 	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
 	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
 	"irreversible": "Это действие необратимо.",
-	"cancel": "Отмена",
-	"permDelete": "Удалить навсегда",
 	"importFiles": "Импорт файлов",
 	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
 	"replaceButtonLabel": "Заменить",
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..36cadcfcce5
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "Предварительный просмотр HTML"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..a80ebf7aef9
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "Недопустимые входные данные для редактора."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..e4db582c42e
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Разработчик"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..18d62a09459
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Открыть инструменты разработчика веб-представлений",
+	"refreshWebviewLabel": "Перезагрузить веб-представления"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 430f371b699..fdff5585e45 100644
--- a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "Да",
+	"no": "Нет",
+	"doNotAskAgain": "Больше не спрашивать",
 	"JsonSchema.locale": "Язык пользовательского интерфейса.",
 	"vscode.extension.contributes.localizations": "Добавляет локализации в редактор",
 	"vscode.extension.contributes.localizations.languageId": "Идентификатор языка, на который будут переведены отображаемые строки.",
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..5c59b0255d7
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Копировать",
+	"copyMarkerMessage": "Копировать сообщение"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..9f1e9238a73
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Всего проблем: {0}",
+	"filteredProblems": "Показано проблем: {0} из {1}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..e99ea342272
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "Проблемы",
+	"tooltip.1": "Проблем в этом файле: 1",
+	"tooltip.N": "Проблем в этом файле: {0}",
+	"markers.showOnFile": "Показывать ошибки и предупреждения для файлов и папки."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..939ceca5ae7
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Просмотр",
+	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
+	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
+	"problems.panel.configuration.title": "Представление \"Проблемы\"",
+	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
+	"markers.panel.title.problems": "Проблемы",
+	"markers.panel.aria.label.problems.tree": "Проблемы, сгруппированные по файлам",
+	"markers.panel.no.problems.build": "В рабочей области проблемы пока не обнаружены.",
+	"markers.panel.no.problems.filters": "Для указанного условия фильтра результаты не обнаружены",
+	"markers.panel.action.filter": "Фильтр проблем",
+	"markers.panel.filter.placeholder": "Фильтровать по типу или тексту",
+	"markers.panel.filter.errors": "ошибки",
+	"markers.panel.filter.warnings": "предупреждения",
+	"markers.panel.filter.infos": "сообщения",
+	"markers.panel.single.error.label": "1 ошибка",
+	"markers.panel.multiple.errors.label": "Ошибок: {0}",
+	"markers.panel.single.warning.label": "1 предупреждение",
+	"markers.panel.multiple.warnings.label": "Предупреждения: {0}",
+	"markers.panel.single.info.label": "1 сообщение",
+	"markers.panel.multiple.infos.label": "Сообщения: {0}",
+	"markers.panel.single.unknown.label": "1 неизвестный",
+	"markers.panel.multiple.unknowns.label": "Неизвестные: {0}",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} с проблемами ({1})",
+	"errors.warnings.show.label": "Показать ошибки и предупреждения"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index a43c7553d81..e62c40fea26 100644
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Показать следующий шаблон включения в поиск",
 	"previousSearchIncludePattern": "Показать предыдущий шаблон включения в поиск ",
-	"nextSearchExcludePattern": "Показать следующий шаблон исключения из поиска",
-	"previousSearchExcludePattern": "Показать предыдущий шаблон исключения из поиска",
 	"nextSearchTerm": "Показать следующее условие поиска",
 	"previousSearchTerm": "Показать предыдущее условие поиска",
 	"showSearchViewlet": "Показать средство поиска",
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
index b197ab3521e..a577a42bfc0 100644
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Переключить сведения о поиске",
-	"searchScope.includes": "включаемые файлы",
-	"label.includes": "Шаблоны включения в поиск",
-	"searchScope.excludes": "исключаемые файлы",
-	"label.excludes": "Шаблоны исключения из поиска",
 	"replaceAll.confirmation.title": "Заменить все",
 	"replaceAll.confirm.button": "Заменить",
 	"replaceAll.occurrence.file.message": "Вхождение {0} заменено в {1} файле на \"{2}\".",
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 60e666cad4c..e2928ed26bf 100644
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "Отменяет связь задачи со всеми группами",
 	"JsonSchema.tasks.group": "Определяет, к какой группе выполнения принадлежит эта задача. Поддерживаемые значения: \"build\" для добавления задачи к группе сборки и \"test\" для добавления задачи к группе тестирования.",
 	"JsonSchema.tasks.type": "Определяет, выполняется ли задача в виде процесса или в виде команды оболочки.",
+	"JsonSchema.command": "Выполняемая команда. Это может быть внешняя программа или команда оболочки.",
+	"JsonSchema.tasks.args": "Аргументы, передаваемые в команду при вызове этой задачи.",
 	"JsonSchema.tasks.label": "Метка пользовательского интерфейса задачи",
 	"JsonSchema.version": "Номер версии конфигурации.",
 	"JsonSchema.tasks.identifier": "Пользовательский идентификатор задачи в файле launch.json или в предложении dependsOn.",
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 8cccd04ba00..9699d3ddc6b 100644
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,10 @@
 	],
 	"tasksCategory": "Задачи",
 	"ConfigureTaskRunnerAction.label": "Настроить задачу",
-	"problems": "Проблемы",
+	"totalErrors": "Ошибок: {0}",
+	"totalWarnings": "Предупреждения: {0}",
+	"totalInfos": "Сообщения: {0}",
 	"building": "Сборка...",
-	"manyMarkers": "99+",
 	"runningTasks": "Показать выполняемые задачи",
 	"tasks": "Задачи",
 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
@@ -46,8 +47,8 @@
 	"recentlyUsed": "недавно использованные задачи",
 	"configured": "настроенные задачи",
 	"detected": "обнаруженные задачи",
-	"TaskService.ignoredFolder": "Следующие папки рабочей области будут проигнорированы, так как в них используется версия задач 0.1.0: {0}",
 	"TaskService.notAgain": "Больше не показывать",
+	"TaskService.ignoredFolder": "Следующие папки рабочей области будут проигнорированы, так как в них используется версия задач 0.1.0: {0}",
 	"TaskService.pickRunTask": "Выберите задачу для запуска",
 	"TaslService.noEntryToRun": "Задача для запуска не найдена. Настройте задачи...",
 	"TaskService.fetchingBuildTasks": "Получение задач сборки...",
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 13433636ffe..76a6659cb9e 100644
--- a/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Ошибка: в конфигурации задачи '{0}' отсутствует необходимое свойство '{1}'. Конфигурация задачи будет проигнорирована.",
 	"ConfigurationParser.notCustom": "Ошибка: задачи не объявлены в качестве пользовательской задачи. Конфигурация будет проигнорирована.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Ошибка: в задаче должно быть указано свойство метки. Задача будет проигнорирована.\n{0}\n",
-	"taskConfiguration.shellArgs": "Предупреждение: задача \"{0}\" является командой оболочки, и один из ее аргументов содержит пробелы без escape-последовательности. Чтобы обеспечить правильную расстановку кавычек в командной строке, объедините аргументы в команде.",
 	"taskConfiguration.noCommandOrDependsOn": "Ошибка: в задаче \"{0}\" не указаны ни команда, ни свойство dependsOn. Задача будет проигнорирована. Определение задачи:\n{1}",
 	"taskConfiguration.noCommand": "Ошибка: задача \"{0}\" не определяет команду. Задача будет игнорироваться. Ее определение:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Версия задач 2.0.0 не поддерживает глобальные задачи для конкретных ОС. Преобразуйте их в задачи с помощью команд для конкретных ОС.\nЗатронутые задачи: {0}"
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 21822900dfd..e8a4956658f 100644
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Копировать",
+	"split": "Разделить",
 	"paste": "Вставить",
 	"selectAll": "Выбрать все",
-	"clear": "Очистить",
-	"split": "Разделить"
+	"clear": "Очистить"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..52d5c03cd56
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Заметки о выпуске: {0}",
+	"unassigned": "не присвоено"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index d80a8d53e52..f279da23009 100644
--- a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "Позже",
-	"unassigned": "не присвоено",
 	"releaseNotes": "Заметки о выпуске",
 	"showReleaseNotes": "Показать заметки о выпуске",
 	"read the release notes": "Вас приветствует {0} v{1}! Вы хотите прочитать заметки о выпуске?",
diff --git a/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..79967c51d9e
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "Редактор веб-представления"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..5cafb4b89da
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "Подробнее"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..360b3b18b2b
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Да",
+	"cancelButton": "Отмена"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index bd6cb49d41e..c3b0dd46f65 100644
--- a/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,6 @@
 	"neverShowAgain": "Больше не показывать",
 	"netVersionError": "Требуется платформа Microsoft .NET Framework 4.5. Нажмите ссылку, чтобы установить ее.",
 	"learnMore": "Инструкции",
-	"enospcError": "В {0} закончились дескрипторы файлов. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
 	"binFailed": "Не удалось переместить \"{0}\" в корзину",
 	"trashFailed": "Не удалось переместить \"{0}\" в корзину."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
index 041ccc58fa5..10de0847f46 100644
--- a/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
 	"fileIsDirectoryError": "Файл является каталогом",
 	"fileNotModifiedError": "undefined",
-	"fileTooLargeForHeapError": "Размер файла превышает объем памяти окна, попробуйте выполнить код с параметром --max-memory=новый_объем_памяти",
 	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
 	"fileNotFoundError": "Файл не найден ({0})",
 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
diff --git a/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..ba82447f37b 100644
--- a/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Отмена"
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..5d438afc47c
--- /dev/null
+++ b/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cssserver.name": "CSS Dil Sunucusu",
+	"folding.start": "Katlama Bölgesi Başlangıcı",
+	"folding.end": "Katlama Bölgesi Sonu"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css-language-features/package.i18n.json b/i18n/trk/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..16d27b93d73
--- /dev/null
+++ b/i18n/trk/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "CSS Dili Özellikleri",
+	"description": "CSS, LESS, SCSS dosyaları için zengin dil desteği sağlar.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
+	"css.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
+	"css.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
+	"css.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
+	"css.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
+	"css.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
+	"css.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
+	"css.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
+	"css.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
+	"css.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
+	"css.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
+	"css.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
+	"css.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
+	"css.lint.unknownProperties.desc": "Bilinmeyen özellik.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
+	"css.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
+	"css.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
+	"css.trace.server.desc": "VS Code ve CSS dil sunucusu arasındaki iletişimi izler.",
+	"css.validate.title": "CSS doğrulamasını ve sorunların önem derecelerini denetler.",
+	"css.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
+	"less.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
+	"less.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
+	"less.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
+	"less.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
+	"less.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
+	"less.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
+	"less.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
+	"less.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
+	"less.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
+	"less.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
+	"less.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
+	"less.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
+	"less.lint.unknownProperties.desc": "Bilinmeyen özellik.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
+	"less.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
+	"less.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
+	"less.validate.title": "LESS doğrulamasını ve sorunların önem derecelerini denetler.",
+	"less.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
+	"scss.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
+	"scss.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
+	"scss.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
+	"scss.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
+	"scss.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
+	"scss.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
+	"scss.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
+	"scss.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
+	"scss.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
+	"scss.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
+	"scss.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
+	"scss.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
+	"scss.lint.unknownProperties.desc": "Bilinmeyen özellik.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
+	"scss.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
+	"scss.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
+	"scss.validate.title": "SCSS doğrulamasını ve sorunların önem derecelerini denetler.",
+	"scss.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
+	"less.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"scss.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"css.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css/package.i18n.json b/i18n/trk/extensions/css/package.i18n.json
index 16d27b93d73..66b4b1f0603 100644
--- a/i18n/trk/extensions/css/package.i18n.json
+++ b/i18n/trk/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS Dili Özellikleri",
-	"description": "CSS, LESS, SCSS dosyaları için zengin dil desteği sağlar.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"css.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"css.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"css.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"css.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"css.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"css.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"css.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"css.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-	"css.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"css.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"css.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"css.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"css.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"css.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"css.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"css.trace.server.desc": "VS Code ve CSS dil sunucusu arasındaki iletişimi izler.",
-	"css.validate.title": "CSS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"css.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"less.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"less.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"less.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"less.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"less.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"less.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"less.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"less.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-	"less.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"less.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"less.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"less.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"less.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"less.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"less.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"less.validate.title": "LESS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"less.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"scss.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"scss.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"scss.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"scss.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"scss.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"scss.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"scss.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"scss.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-	"scss.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"scss.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"scss.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"scss.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"scss.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"scss.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"scss.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"scss.validate.title": "SCSS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"scss.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"less.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"scss.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"css.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
+	"displayName": "CSS Dil Temelleri",
+	"description": "CSS, LESS ve SCSS dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/commands.i18n.json b/i18n/trk/extensions/git/out/commands.i18n.json
index 9ab82c662af..1feaf1cddaf 100644
--- a/i18n/trk/extensions/git/out/commands.i18n.json
+++ b/i18n/trk/extensions/git/out/commands.i18n.json
@@ -75,7 +75,6 @@
 	"ok": "Tamam",
 	"push with tags success": "Başarılı bir şekilde etiketlerle gönderildi.",
 	"pick remote": "'{0}' dalının yayınlanacağı bir uzak uçbirim seçin:",
-	"sync is unpredictable": "Bu eylem, '{0}' esas projesine commitleri gönderecek ve alacaktır.",
 	"never again": "Tamam, Tekrar Gösterme",
 	"no remotes to publish": "Deponuzda yayınlamanın yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
 	"no changes stash": "Geçici olarak saklanacak bir değişiklik yok.",
diff --git a/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..cd480d42123
--- /dev/null
+++ b/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"htmlserver.name": "HTML Dil Sunucusu",
+	"folding.start": "Katlama Bölgesi Başlangıcı",
+	"folding.end": "Katlama Bölgesi Sonu"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html-language-features/package.i18n.json b/i18n/trk/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..00e0da3830a
--- /dev/null
+++ b/i18n/trk/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML Dili Özellikleri",
+	"description": "HTML, Razor ve Handlebar dosyaları için zengin dil desteği sağlar.",
+	"html.format.enable.desc": "Varsayılan HTML biçimlendiricisini etkinleştirin/devre dışı bırakın",
+	"html.format.wrapLineLength.desc": "Satır başına en fazla karakter miktarı (0 = devre dışı bırak)",
+	"html.format.unformatted.desc": "Yeniden biçimlendirilmeyecek virgülle ayrılmış etiketler listesi. 'null' değeri, https://www.w3.org/TR/html5/dom.html#phrasing-content adresinde listelenen tüm etiketleri varsayılan olarak belirler.",
+	"html.format.contentUnformatted.desc": "İçeriğin yeniden biçimlendirilmeyeceği virgülle ayrılmış etiketler listesi. 'null' değeri, 'pre' etiketini varsayılan olarak belirler.",
+	"html.format.indentInnerHtml.desc": "<head> ve <body> bölümlerini girintile.",
+	"html.format.preserveNewLines.desc": "Ögelerden önceki mevcut satır sonlarının korunup korunmayacağı. Yalnızca ögelerden önce çalışır, etiketler içinde veya metinde çalışmaz.",
+	"html.format.maxPreserveNewLines.desc": "Bir öbekte korunacak maksimum satır sonu sayısı. Sınırsız için 'null' değerini kullanın.",
+	"html.format.indentHandlebars.desc": "{{#foo}} ve {{/foo}}'yu biçimlendir ve girintile.",
+	"html.format.endWithNewline.desc": "Boş bir satırla bitir.",
+	"html.format.extraLiners.desc": "Kendilerinden önce ek bir boş satır bulunması gereken virgülle ayrılmış etiketler listesi. 'null' değeri, \"head, body, /html\" değerini varsayılan olarak belirler.",
+	"html.format.wrapAttributes.desc": "Öznitelikleri sarmala.",
+	"html.format.wrapAttributes.auto": "Öznitelikleri sadece satır uzunluğu aşıldığında sarmala.",
+	"html.format.wrapAttributes.force": "İlki hariç tüm öznitelikleri sarmala.",
+	"html.format.wrapAttributes.forcealign": "İlki hariç tüm öznitelikleri sarmala ve hizada tut.",
+	"html.format.wrapAttributes.forcemultiline": "Tüm öznitelikleri sarmala.",
+	"html.suggest.angular1.desc": "Yerleşik HTML dili desteğinin Angular V1 etiketlerini ve özelliklerini önerip önermeyeceğini yapılandırır.",
+	"html.suggest.ionic.desc": "Yerleşik HTML dili desteğinin Ionic etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
+	"html.suggest.html5.desc": "Yerleşik HTML dili desteğinin HTML5 etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
+	"html.trace.server.desc": "VS Code ve HTML dil sunucusu arasındaki iletişimi izler.",
+	"html.validate.scripts": "Yerleşik HTML dili desteğinin HTML5 gömülü betikleri doğrulayıp doğrulamayacağını yapılandırır.",
+	"html.validate.styles": "Yerleşik HTML dili desteğinin HTML5 gömülü stilleri doğrulayıp doğrulamayacağını yapılandırır.",
+	"html.autoClosingTags": "HTML etiketlerinin otomatik kapatılmasını etkinleştirin/devre dışı bırakın"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html/package.i18n.json b/i18n/trk/extensions/html/package.i18n.json
index 6cae077d9f9..7b449502bb0 100644
--- a/i18n/trk/extensions/html/package.i18n.json
+++ b/i18n/trk/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML Dili Özellikleri",
-	"description": "HTML, Razor ve Handlebar dosyaları için zengin dil desteği sağlar.",
-	"html.format.enable.desc": "Varsayılan HTML biçimlendiricisini etkinleştirin/devre dışı bırakın",
-	"html.format.wrapLineLength.desc": "Satır başına en fazla karakter miktarı (0 = devre dışı bırak)",
-	"html.format.unformatted.desc": "Yeniden biçimlendirilmeyecek virgülle ayrılmış etiketler listesi. 'null' değeri, https://www.w3.org/TR/html5/dom.html#phrasing-content adresinde listelenen tüm etiketleri varsayılan olarak belirler.",
-	"html.format.contentUnformatted.desc": "İçeriğin yeniden biçimlendirilmeyeceği virgülle ayrılmış etiketler listesi. 'null' değeri, 'pre' etiketini varsayılan olarak belirler.",
-	"html.format.indentInnerHtml.desc": "<head> ve <body> bölümlerini girintile.",
-	"html.format.preserveNewLines.desc": "Ögelerden önceki mevcut satır sonlarının korunup korunmayacağı. Yalnızca ögelerden önce çalışır, etiketler içinde veya metinde çalışmaz.",
-	"html.format.maxPreserveNewLines.desc": "Bir öbekte korunacak maksimum satır sonu sayısı. Sınırsız için 'null' değerini kullanın.",
-	"html.format.indentHandlebars.desc": "{{#foo}} ve {{/foo}}'yu biçimlendir ve girintile.",
-	"html.format.endWithNewline.desc": "Boş bir satırla bitir.",
-	"html.format.extraLiners.desc": "Kendilerinden önce ek bir boş satır bulunması gereken virgülle ayrılmış etiketler listesi. 'null' değeri, \"head, body, /html\" değerini varsayılan olarak belirler.",
-	"html.format.wrapAttributes.desc": "Öznitelikleri sarmala.",
-	"html.format.wrapAttributes.auto": "Öznitelikleri sadece satır uzunluğu aşıldığında sarmala.",
-	"html.format.wrapAttributes.force": "İlki hariç tüm öznitelikleri sarmala.",
-	"html.format.wrapAttributes.forcealign": "İlki hariç tüm öznitelikleri sarmala ve hizada tut.",
-	"html.format.wrapAttributes.forcemultiline": "Tüm öznitelikleri sarmala.",
-	"html.suggest.angular1.desc": "Yerleşik HTML dili desteğinin Angular V1 etiketlerini ve özelliklerini önerip önermeyeceğini yapılandırır.",
-	"html.suggest.ionic.desc": "Yerleşik HTML dili desteğinin Ionic etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-	"html.suggest.html5.desc": "Yerleşik HTML dili desteğinin HTML5 etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-	"html.trace.server.desc": "VS Code ve HTML dil sunucusu arasındaki iletişimi izler.",
-	"html.validate.scripts": "Yerleşik HTML dili desteğinin HTML5 gömülü betikleri doğrulayıp doğrulamayacağını yapılandırır.",
-	"html.validate.styles": "Yerleşik HTML dili desteğinin HTML5 gömülü stilleri doğrulayıp doğrulamayacağını yapılandırır.",
-	"html.experimental.syntaxFolding": "Sözdimine duyarlı katlama işaretleyicilerini etkinleştirin/devre dışı bırakın.",
-	"html.autoClosingTags": "HTML etiketlerinin otomatik kapatılmasını etkinleştirin/devre dışı bırakın"
+	"displayName": "HTML Dil Temelleri",
+	"description": "HTML dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve kod parçacıkları sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..34990f71588
--- /dev/null
+++ b/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"jsonserver.name": "JSON Dil Sunucusu"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json-language-features/package.i18n.json b/i18n/trk/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..94799976a72
--- /dev/null
+++ b/i18n/trk/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "JSON Dili Özellikleri",
+	"description": "JSON dosyaları için zengin dil desteği sağlar.",
+	"json.schemas.desc": "Şemaları geçerli projedeki JSON dosyalarıyla ilişkilendir",
+	"json.schemas.url.desc": "Bir şemanın URL'si veya geçerli dizindeki bir şemanın göreli yolu",
+	"json.schemas.fileMatch.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için kullanılacak bir dosya düzenleri dizisi.",
+	"json.schemas.fileMatch.item.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için '*' içerebilen bir dosya düzeni.",
+	"json.schemas.schema.desc": "Verilen URL için şema tanımı. Şema, yalnızca şema URL'sine erişimi önlemek için sağlanmalıdır.",
+	"json.format.enable.desc": "Varsayılan JSON biçimlendiricisini etkinleştirin/devre dışı bırakın (yeniden başlatma gerektirir)",
+	"json.tracing.desc": "VS Code ve JSON dil sunucusu arasındaki iletişimi izler.",
+	"json.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json/package.i18n.json b/i18n/trk/extensions/json/package.i18n.json
index 9f3d0ff8c56..edd35777010 100644
--- a/i18n/trk/extensions/json/package.i18n.json
+++ b/i18n/trk/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON Dili Özellikleri",
-	"description": "JSON dosyaları için zengin dil desteği sağlar.",
-	"json.schemas.desc": "Şemaları geçerli projedeki JSON dosyalarıyla ilişkilendir",
-	"json.schemas.url.desc": "Bir şemanın URL'si veya geçerli dizindeki bir şemanın göreli yolu",
-	"json.schemas.fileMatch.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için kullanılacak bir dosya düzenleri dizisi.",
-	"json.schemas.fileMatch.item.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için '*' içerebilen bir dosya düzeni.",
-	"json.schemas.schema.desc": "Verilen URL için şema tanımı. Şema, yalnızca şema URL'sine erişimi önlemek için sağlanmalıdır.",
-	"json.format.enable.desc": "Varsayılan JSON biçimlendiricisini etkinleştirin/devre dışı bırakın (yeniden başlatma gerektirir)",
-	"json.tracing.desc": "VS Code ve JSON dil sunucusu arasındaki iletişimi izler.",
-	"json.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"json.experimental.syntaxFolding": "Sözdizimi duyarlı katlama işaretçilerini etkinleştirin/devre dışı bırakın."
+	"displayName": "JSON Dil Temelleri",
+	"description": "JSON dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..44f66398a79
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles' yüklenemedi: {0}"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..3a5b0eca0e2
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"lockedPreviewTitle": "[Önizleme] {0}",
+	"previewTitle": "{0} Önizlemesi"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..76db8cd58cf
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"preview.securityMessage.text": "Bu belgedeki bazı içerikler devre dışı bırakıldı",
+	"preview.securityMessage.title": "Markdown önizlemesinde potansiyel olarak tehlikeli veya güvenli olmayan içerik devre dışı bırakıldı. Güvenli olmayan içeriğe izin vermek veya betikleri etkinleştirmek için Markdown önizleme güvenlik ayarını değiştirin",
+	"preview.securityMessage.label": "İçerik Devre Dışı Güvenlik Uyarısı"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/security.i18n.json b/i18n/trk/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..df9d9eb7615
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"strict.title": "Katı",
+	"strict.description": "Sadece güvenli içeriği yükle",
+	"insecureContent.title": "Güvenli olmayan içeriğe izin ver",
+	"insecureContent.description": "Http üzerinden içerik yüklemeyi etkinleştir",
+	"disable.title": "Devre Dışı Bırak",
+	"disable.description": "Tüm içeriğe ve betik yürütmeye izin ver. Tavsiye edilmez",
+	"moreInfo.title": "Daha Fazla Bilgi",
+	"enableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını etkinleştir",
+	"disableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını devre dışı bırak",
+	"toggleSecurityWarning.description": "İçerik güvenlik seviyesini etkilemez",
+	"preview.showPreviewSecuritySelector.title": "Bu çalışma alanında Markdown önizlemeleri için güvenlik ayarlarını seçin"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/package.i18n.json b/i18n/trk/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..c7a539dac45
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Markdown Dili Özellikleri",
+	"description": "Markdown için zengin dil desteği sağlar.",
+	"markdown.preview.breaks.desc": "Markdown önizlemesinde satır sonlarının nasıl gösterileceğini ayarlar. 'true' olarak ayarlamak, her yeni satırda bir <br> oluşturur.",
+	"markdown.preview.linkify": "Markdown önizlemesinde URL benzeri metinlerin bağlantıya çevrilmesini etkinleştir veya devre dışı bırak.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Düzenleyiciye geçiş yapmak için Markdown önizlemesine çift tıklayın.",
+	"markdown.preview.fontFamily.desc": "Markdown önizlemesinde kullanılan yazı tipi ailesini denetler.",
+	"markdown.preview.fontSize.desc": "Markdown önizlemesinde kullanılan yazı tipi boyutunu piksel olarak denetler.",
+	"markdown.preview.lineHeight.desc": "Markdown önizlemesinde kullanılan satır yüksekliğini denetler. Bu sayı yazı tipi boyutuna görecelidir.",
+	"markdown.preview.markEditorSelection.desc": "Markdown önizlemesinde geçerli düzenleyici seçimini işaretle.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Markdown önizlemesi kaydırıldığında, düzenleyicinin görünümünü güncelle.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown düzenleyicisi kaydırıldığında, önizlemenin görünümünü güncelle.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Kullanım Dışı] Düzenleyicide seçili satırın görünmesi için Markdown önizlemesini kaydırır.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Bu ayar 'markdown.preview.scrollPreviewWithEditor' ile değiştirildi ve artık hiçbir etkisi bulunmamaktadır.",
+	"markdown.preview.title": "Önizlemeyi Aç",
+	"markdown.previewFrontMatter.dec": "YAML ön maddesinin Markdown önizlemesinde nasıl gösterilmesi gerektiğini ayarlar. 'hide' ön maddeyi kaldırır. Diğer türlü; ön madde, Markdown içeriği olarak sayılır.",
+	"markdown.previewSide.title": "Önizlemeyi Yana Aç",
+	"markdown.showLockedPreviewToSide.title": "Kilitlenmiş Önizlemeyi Yana Aç",
+	"markdown.showSource.title": "Kaynağı Göster",
+	"markdown.styles.dec": "Markdown önizlemesinde kullanılmak üzere CSS stil dosyalarını işaret eden bir URL'ler veya yerel yollar listesi. Göreli yollar, gezginde açılan klasöre göreli olarak yorumlanır.",
+	"markdown.showPreviewSecuritySelector.title": "Önizleme Güvenlik Ayarlarını Değiştir",
+	"markdown.trace.desc": "Markdown eklentisi için hata ayıklama günlüğünü etkinleştir.",
+	"markdown.preview.refresh.title": "Önizlemeyi Yenile",
+	"markdown.preview.toggleLock.title": "Önizleme Kilitlemeyi Aç/Kapat"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..d882c2764da
--- /dev/null
+++ b/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"php.useExecutablePath": "{0} (çalışma alanı ayarı olarak tanımlı) yürütülebilir dosyasına PHP dosyalarını doğrulama izni veriyor musunuz?",
+	"php.yes": "İzin Ver",
+	"php.no": "İzin Verme",
+	"wrongExecutable": "{0} geçerli bir php yürütülebilir dosyası olmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
+	"noExecutable": "Hiçbir PHP yürütülebilir dosyası ayarlanmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
+	"unknownReason": "{0} yolu kullanılarak php çalıştırılamadı. Sebep bilinmiyor."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php-language-features/package.i18n.json b/i18n/trk/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..9ee5b59f86c
--- /dev/null
+++ b/i18n/trk/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"configuration.suggest.basic": "Yerleşik PHP dili önerilerinin etkinleştirilip etkinleştirilmediğini yapılandırır. Destek, PHP globalleri ve değişkenleri önerir.",
+	"configuration.validate.enable": "Yerleşik PHP doğrulamasını etkinleştir/devre dışı bırak.",
+	"configuration.validate.executablePath": "PHP çalıştırılabilir dosyasına işaret eder.",
+	"configuration.validate.run": "Doğrulayıcının kayıt esnasında mı tuşlama esnasında mı çalışacağı.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP doğrulama yürütülebilir dosyasına izin verme (çalışma alanı ayarı olarak tanımlanır)",
+	"displayName": "PHP Dil Özellikleri",
+	"description": "PHP dosyaları için zengin dil desteği sağlar."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php/package.i18n.json b/i18n/trk/extensions/php/package.i18n.json
index dbcdfc169f6..002f7c0d2d7 100644
--- a/i18n/trk/extensions/php/package.i18n.json
+++ b/i18n/trk/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Yerleşik PHP dili önerilerinin etkinleştirilip etkinleştirilmediğini yapılandırır. Destek, PHP globalleri ve değişkenleri önerir.",
-	"configuration.validate.enable": "Yerleşik PHP doğrulamasını etkinleştir/devre dışı bırak.",
-	"configuration.validate.executablePath": "PHP çalıştırılabilir dosyasına işaret eder.",
-	"configuration.validate.run": "Doğrulayıcının kayıt esnasında mı tuşlama esnasında mı çalışacağı.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP doğrulama yürütülebilir dosyasına izin verme (çalışma alanı ayarı olarak tanımlanır)",
 	"displayName": "PHP Dil Özellikleri",
-	"description": "PHP dosyaları için gelişmiş kod tamamlama(IntelliSense), doğrulama ve dil temelleri sağlar."
+	"description": "PHP dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 9a43ba50fdf..285e792d6c3 100644
--- a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -14,8 +14,8 @@
 	"noResults": "Sonuç bulunamadı",
 	"settingsSearchIssue": "Ayar Arama Sorunu",
 	"bugReporter": "Hata Raporu",
-	"performanceIssue": "Performans Sorunu",
 	"featureRequest": "Özellik İsteği",
+	"performanceIssue": "Performans Sorunu",
 	"stepsToReproduce": "Yeniden oluşturma adımları",
 	"bugDescription": "Sorunu güvenilir şekilde yeniden oluşturmak için gerekli adımları paylaşın. Lütfen gerçekleşen ve beklenen sonuçları ekleyin. GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
 	"performanceIssueDesciption": "Bu performans sorunu ne zaman oluştu? Başlangıçta mı yoksa belirli eylemlerden sonra mı oluşuyor? GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
diff --git a/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
index b57bfc02dd1..93a32fa6ed1 100644
--- a/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,9 @@
 	"warningBorder": "Düzenleyicideki uyarı karalamalarının kenarlık rengi.",
 	"infoForeground": "Düzenleyicideki bilgilendirme karalamalarının ön plan rengi.",
 	"infoBorder": "Düzenleyicideki bilgilendirme karalamalarının kenarlık rengi.",
-	"overviewRulerRangeHighlight": "Aralık vurguları için genel bakış cetvelinin işaretleyici rengi.",
+	"hintForeground": "Düzenleyicideki ipucu karalamalarının ön plan rengi.",
+	"hintBorder": "Düzenleyicideki ipucu karalamalarının kenarlık rengi.",
+	"overviewRulerRangeHighlight": "Aralık vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
 	"overviewRuleError": "Hatalar için genel bakış cetvelinin işaretleyici rengi.",
 	"overviewRuleWarning": "Uyarılar için genel bakış cetvelinin işaretleyici rengi.",
 	"overviewRuleInfo": "Bilgilendirmeler için genel bakış cetvelinin işaretleyici rengi."
diff --git a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 937537fbe28..06ac02ab7ec 100644
--- a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Sonraki Soruna Git (Hata, Uyarı, Bilgi)",
-	"markerAction.previous.label": "Önceki Soruna Git (Hata, Uyarı, Bilgi)",
-	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
-	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
-	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
-	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
+	"markerAction.previous.label": "Önceki Soruna Git (Hata, Uyarı, Bilgi)"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..c3b60a4637d
--- /dev/null
+++ b/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
+	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
+	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
+	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..635fee26cd5
--- /dev/null
+++ b/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"Sunday": "Pazar",
+	"Monday": "Pazartesi",
+	"Tuesday": "Salı",
+	"Wednesday": "Çarşamba",
+	"Thursday": "Perşembe",
+	"Friday": "Cuma",
+	"Saturday": "Cumartesi",
+	"SundayShort": "Paz",
+	"MondayShort": "Pzt",
+	"TuesdayShort": "Sal",
+	"WednesdayShort": "Çar",
+	"ThursdayShort": "Per",
+	"FridayShort": "Cum",
+	"SaturdayShort": "Cmt",
+	"January": "Ocak",
+	"February": "Şubat",
+	"March": "Mart",
+	"April": "Nisan",
+	"May": "Mayıs",
+	"June": "Haziran",
+	"July": "Temmuz",
+	"August": "Ağustos",
+	"September": "Eylül",
+	"October": "Ekim",
+	"November": "Kasım",
+	"December": "Aralık",
+	"JanuaryShort": "Oca",
+	"FebruaryShort": "Şub",
+	"MarchShort": "Mar",
+	"AprilShort": "Nis",
+	"MayShort": "May",
+	"JuneShort": "Haz",
+	"JulyShort": "Tem",
+	"AugustShort": "Ağu",
+	"SeptemberShort": "Eyl",
+	"OctoberShort": "Eki",
+	"NovemberShort": "Kas",
+	"DecemberShort": "Ara"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index e4f61af229f..5d14aeee198 100644
--- a/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Bir değişkene yazmak gibi, yazma-erişimi sırasındaki bir sembolün arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
 	"wordHighlightBorder": "Bir değişken okunurken ki gibi, bir sembolün okuma-erişimi sırasındaki kenarlık rengi.",
 	"wordHighlightStrongBorder": "Bir değişkene yazılırken ki gibi, bir sembolün yazma erişimi sırasındaki kenarlık rengi.",
-	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
+	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
+	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
 	"wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git",
 	"wordHighlight.previous.label": "Önceki Sembol Vurgusuna Git"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..0bc4bb5dea3
--- /dev/null
+++ b/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"moreFile": "...1 ek dosya gösterilmiyor",
+	"moreFiles": "...{0} ek dosya gösterilmiyor"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..40e62eb8c37
--- /dev/null
+++ b/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"cancel": "İptal"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 9f87cfce521..06d66b62a1e 100644
--- a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,7 +14,7 @@
 	"errorInstallingDependencies": "Bağımlılıklar yüklenirken hata oluştu. {0}",
 	"MarketPlaceDisabled": "Market etkin değil",
 	"removeError": "Eklenti kaldırılırken hata oluştu: {0}. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.",
-	"Not Market place extension": "Sadece Market Eklentileri yeniden yüklenebilir",
+	"Not a Marketplace extension": "Sadece Market Eklentileri yeniden yüklenebilir",
 	"notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.",
 	"malicious extension": "Eklenti sorunlu olarak bildirildiği için yüklenemiyor.",
 	"notFoundCompatibleDependency": "Yükleme başarısız oldu çünkü, bağımlılığı bulunan '{0}' eklentisinin uyumlu olduğu VS Code'un '{1}' sürümü bulunamadı.",
@@ -22,7 +22,7 @@
 	"exitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
 	"uninstallDependeciesConfirmation": "Yalnızca '{0}' eklentisini mi yoksa bağımlılıklarını da kaldırmak ister misiniz?",
 	"uninstallOnly": "Sadece Eklenti",
-	"uninstallAll": "Tümü",
+	"uninstallAll": "Tümünü Kaldır",
 	"uninstallConfirmation": "'{0}' eklentisini kaldırmak istediğinizden emin misiniz?",
 	"ok": "Tamam",
 	"singleDependentError": "'{0}' eklentisi kaldırılamıyor. '{1}' eklentisi buna bağlı.",
diff --git a/i18n/trk/src/vs/platform/list/browser/listService.i18n.json b/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
index 8cc26093046..ad10361dfb6 100644
--- a/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Ağaç veya listelerdeki bir ögenin çoklu seçime fare ile eklenmesinde kullanılacak değiştirici(örneğin gezgin, açık düzenleyiciler ve scm görünümlerinde). `ctrlCmd` Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir. 'Yana Aç' fare hareketleri - destekleniyorsa - birden çok seçim değiştiricisi ile çakışmayacak şekilde uyum sağlarlar.",
 	"openMode.singleClick": "Tek tıklamayla ögeleri aç.",
 	"openMode.doubleClick": "Çift tıklamayla ögeleri aç.",
-	"openModeModifier": "Ağaç ve listelerdeki ögelerin (destekleniyorsa) fare ile nasıl açılacağını denetler. Ögeleri tek tıklamayla açmak için `singleClick`, çift tıklamayla açmak için `doubleClick` olarak ayarlayın. Ağaçlardaki alt ögeler içeren ögeler için bu ayar üst ögenin tek veya çift tıklama tarafından genişletilmesini denetler. Bazı ağaç veya listelerin, bu ayar uygulanamaz ise görmezden gelmeyi seçebileceklerini unutmayın."
+	"openModeModifier": "Ağaç ve listelerdeki ögelerin (destekleniyorsa) fare ile nasıl açılacağını denetler. Ögeleri tek tıklamayla açmak için `singleClick`, çift tıklamayla açmak için `doubleClick` olarak ayarlayın. Ağaçlardaki alt ögeler içeren ögeler için bu ayar üst ögenin tek veya çift tıklama tarafından genişletilmesini denetler. Bazı ağaç veya listelerin, bu ayar uygulanamaz ise görmezden gelmeyi seçebileceklerini unutmayın.",
+	"horizontalScrolling setting": "Çalışma ekranındaki ağaçların yatay kaydırmayı destekleyip desteklemeyeceğini denetler."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/markers/common/markers.i18n.json b/i18n/trk/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..bc3e8108119
--- /dev/null
+++ b/i18n/trk/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"sev.error": "Hata",
+	"sev.warning": "Uyarı",
+	"sev.info": "Bilgi"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
index 1135da6951e..4b0f1b56d92 100644
--- a/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" için genel bakış cetveli ön planı.",
 	"overviewRulerIncomingContentForeground": "Satır içi birleştirme çakışmalarında gelen genel bakış cetveli ön planı.",
 	"overviewRulerCommonContentForeground": "Satır içi birleştirme çakışmalarında ortak ata genel bakış cetveli ön planı.",
-	"overviewRulerFindMatchForeground": "Bulunan eşler için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRulerSelectionHighlightForeground": "Seçim vurguları için genel bakış cetvelinin işaretleyici rengi."
+	"overviewRulerFindMatchForeground": "Bulunan eşler için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
+	"overviewRulerSelectionHighlightForeground": "Seçim vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..b8ebfa4861f
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"extensionSource": "{0} (Eklenti)"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index d0faef6808c..90a1b3244f9 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Sonraki Gruba Odakla",
 	"openToSide": "Yana Aç",
 	"closeEditor": "Düzenleyiciyi Kapat",
+	"closeOneEditor": "Kapat",
 	"revertAndCloseActiveEditor": "Geri Al ve Düzenleyiciyi Kapat",
 	"closeEditorsToTheLeft": "Düzenleyicinin Solundakileri Kapat",
 	"closeAllEditors": "Tüm Düzenleyicileri Kapat",
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 166ea0d4a6f..4c89a16f31a 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Kapat",
 	"araLabelEditorActions": "Düzenleyici eylemleri"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 320cb9f421d..05ae29fe427 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Yeni bildirim yok",
 	"notifications": "Bildirimler",
 	"notificationsToolbar": "Bildirim Merkezi Eylemleri",
 	"notificationsList": "Bildirim Listesi"
diff --git a/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
index c69d16c0b90..8653d808605 100644
--- a/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,8 +45,6 @@
 	"windowConfigurationTitle": "Pencere",
 	"window.openFilesInNewWindow.on": "Dosyalar yeni bir pencerede açılacak",
 	"window.openFilesInNewWindow.off": "Dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak",
-	"window.openFilesInNewWindow.default": "Dosyalar, Dock veya Finder ile açılmadıkça (sadece macOS için) dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak",
-	"openFilesInNewWindow": "Dosyaların yeni bir pencerede açılıp açılmayacağını denetler.\n- default: dosyalar, Dock veya Finder ile açılmadıkça (sadece macOS için) dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\n- on: dosyalar yeni bir pencerede açılacak\n- off: dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
 	"window.openFoldersInNewWindow.on": "Klasörler yeni bir pencerede açılacak",
 	"window.openFoldersInNewWindow.off": "Klasörler son aktif pencereyi değiştirir",
 	"window.openFoldersInNewWindow.default": "Klasörler, bir klasör uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır",
@@ -58,7 +56,6 @@
 	"restoreWindows": "Pencerelerin, bir yeniden başlatma sonrası nasıl yeniden açılacağını denetler. Her zaman boş bir çalışma alanı ile başlamak için 'none', üzerinde çalıştığınız son pencereyi yeniden açmak için 'one', açık klasör bulunduran tüm pencereleri yeniden açmak için 'folders' veya son oturumunuzdaki tüm pencereleri yeniden açmak için 'all' seçeneğini seçin.",
 	"restoreFullscreen": "Bir pencere tam ekran modundayken çıkıldıysa, bu pencerenin tam ekran moduna geri dönüp dönmeyeceğini denetler.",
 	"zoomLevel": "Pencerenin yakınlaştırma düzeyini ayarlayın. Orijinal boyut 0'dır ve üstündeki (ör. 1) veya altındaki (ör. -1) her artırma 20% daha fazla veya az yakınlaştırmayı temsil eder. Yakınlaştırma düzeyini daha ince ayrıntılarla ayarlamak için ondalık değerler de girebilirsiniz.",
-	"title": "Pencere başlığını aktif düzenleyiciye bağlı olarak denetler. Değişkenler, bağlama göre değiştirilir:\n${activeEditorShort}: dosyanın adı (ör. myFile.txt)\n${activeEditorMedium}: çalışma alanı klasörüne göreli dosyanın yolu (ör. myFolder/myFile.txt)\n${activeEditorLong}: dosyanın tam yolu (ör. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: dosyayı içeren çalışma alanı klasörünün adı (ör. myFolder)\n${folderPath}: dosyayı içeren çalışma alanı klasörünün yolu (ör. /Users/Development/myFolder)\n${rootName}: çalışma alanının adı (ör. myFolder veya myWorkspace)\n${rootPath}: çalışma alanının yolu (ör. /Users/Development/myWorkspace)\n${appName}: ör. VS Code\n${dirty}: etkin düzenleyici kaydedilmemiş değişiklikler içeriyorsa, değişiklik göstergesi\n${separator}: şartlı ayırıcı (\" - \") yalnızca değer içeren değişkenlerle çevrili olduğunda gösterilir",
 	"window.newWindowDimensions.default": "Yeni pencereleri ekranın ortasında açın.",
 	"window.newWindowDimensions.inherit": "Yeni pencereleri son aktif pencere ile aynı ölçülerde açın.",
 	"window.newWindowDimensions.maximized": "Yeni pencereleri ekranı kapla modunda açın.",
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 4058874430b..fe54980e241 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Çerçeveyi Yeniden Başlat",
 	"removeBreakpoint": "Kesme Noktasını Kaldır",
 	"removeAllBreakpoints": "Tüm Kesme Noktalarını Kaldır",
-	"enableBreakpoint": "Kesme Noktasını Etkinleştir",
-	"disableBreakpoint": "Kesme Noktasını Devre Dışı Bırak",
 	"enableAllBreakpoints": "Tüm Kesme Noktalarını Etkinleştir",
 	"disableAllBreakpoints": "Tüm Kesme Noktalarını Devre Dışı Bırak",
 	"activateBreakpoints": "Kesme Noktalarını Etkinleştir",
 	"deactivateBreakpoints": "Kesme Noktalarını Devre Dışı Bırak",
 	"reapplyAllBreakpoints": "Tüm Kesme Noktalarını Yeniden Uygula",
 	"addFunctionBreakpoint": "Fonksiyon Kesme Noktası Ekle",
-	"addConditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
-	"editConditionalBreakpoint": "Kesme Noktasını Düzenle...",
 	"setValue": "Değeri Ayarla",
 	"addWatchExpression": "İfade Ekle",
 	"editWatchExpression": "İfadeyi Düzenle",
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..30a355a88d6
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
+	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
+	"breakpointWidgetHitCountAriaLabel": "Program, burada sadece isabet sayısı koşulu sağlandığında durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
+	"breakpointWidgetAriaLabel": "Program, burada sadece bu koşul doğruysa durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
+	"expression": "İfade",
+	"hitCount": "İsabet Sayısı",
+	"logMessage": "Günlük Mesajı"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index d616f9186fd..05751eef2fe 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"editBreakpoint": "Kesme Noktasını Düzenle...",
+	"disableBreakpoint": "Kesme Noktasını Devre Dışı Bırak",
+	"enableBreakpoint": "Kesme Noktasını Etkinleştir",
 	"removeBreakpoints": "Kesme Noktalarını Kaldır",
 	"removeBreakpointOnColumn": "{0}. Sütundaki Kesme Noktasını Kaldır",
 	"removeLineBreakpoint": "Satır Kesme Noktasını Kaldır",
@@ -18,5 +21,6 @@
 	"enableBreakpoints": "{0}. Sütundaki Kesme Noktasını Etkinleştir",
 	"enableBreakpointOnLine": "Satır Kesme Noktasını Etkinleştir",
 	"addBreakpoint": "Kesme Noktası Ekle",
+	"conditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
 	"addConfiguration": "Yapılandırma Ekle..."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index af1679c27ae..7a4c4a13ddb 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -28,7 +28,5 @@
 	"preLaunchTaskExitCode": "'{0}' ön başlatma görevi {1} çıkış koduyla sonlandı.",
 	"showErrors": "Hataları Göster",
 	"noFolderWorkspaceDebugError": "Aktif dosyada hata ayıklama yapılamıyor. Lütfen, dosyanın diskte kayıtlı olduğundan ve bu dosya türü için hata ayıklama eklentinizin olduğundan emin olun.",
-	"cancel": "İptal",
-	"DebugTaskNotFound": "'{0}' ön başlatma görevi bulunamadı.",
-	"taskNotTracked": "'{0}' başlatma öncesi görevi izlenemez."
+	"cancel": "İptal"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index dd429e27225..cf227b35676 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -18,6 +18,7 @@
 	"debugRequest": "Yapılandırmanın istek türü. \"launch\" veya \"attach\" olabilir.",
 	"debugServer": "Sadece eklenti geliştirme hata ayıklaması için: eğer port belirtildiyse; Vs Code, bir hata ayıklama bağdaştırıcısına sunucu modunda bağlanmayı dener",
 	"debugPrelaunchTask": "Hata ayıklama oturumu başlamadan önce çalıştırılacak görev.",
+	"debugPostDebugTask": "Hata ayıklama oturumu sona erdikten sonra çalıştırılacak görev.",
 	"debugWindowsConfiguration": "Windows'a özel başlangıç yapılandırması öznitelikleri.",
 	"debugOSXConfiguration": "OS X'e özel başlangıç yapılandırması öznitelikleri.",
 	"debugLinuxConfiguration": "Linux'a özel başlangıç yapılandırması öznitelikleri.",
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index ed1393cf726..ef58948ca49 100644
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -27,7 +27,7 @@
 	"enableAutoUpdate": "Eklentileri Otomatik Olarak Güncelleştirmeyi Etkinleştir",
 	"disableAutoUpdate": "Eklentileri Otomatik Olarak Güncelleştirmeyi Devre Dışı Bırak",
 	"updateAll": "Tüm Eklentileri Güncelle",
-	"reloadAction": "Yeniden Yükle",
+	"reloadAction": "Pencereyi Yeniden Yükle",
 	"postUpdateTooltip": "Güncellemek için yeniden yükleyin",
 	"postUpdateMessage": "Güncellenen '{0}' eklentisini etkinleştirmek için bu pencere yeniden yüklensin mi?",
 	"postEnableTooltip": "Etkinleştirmek için yeniden yükleyin",
@@ -58,6 +58,8 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Tavsiye Edilen Eklentileri Yapılandır (Çalışma Alanı Klasörü)",
 	"malicious tooltip": "Bu eklentinin sorunlu olduğu bildirildi.",
 	"malicious": "Kötü amaçlı",
+	"disabled": "Devre Dışı",
+	"disabled globally": "Devre Dışı",
 	"disableAll": "Yüklü Tüm Eklentileri Devre Dışı Bırak",
 	"disableAllWorkspace": "Bu Çalışma Alanı için Yüklü Tüm Eklentileri Devre Dışı Bırak",
 	"enableAll": "Tüm Eklentileri Etkinleştir",
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..e72bf637256
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"name": "Eklenti adı",
+	"extension id": "Eklenti tanımlayıcısı",
+	"preview": "Önizleme",
+	"builtin": "Yerleşik",
+	"publisher": "Yayıncı adı",
+	"install count": "Yüklenme sayısı",
+	"rating": "Derecelendirme",
+	"repository": "Depo",
+	"license": "Lisans",
+	"details": "Detaylar",
+	"contributions": "Eklemeler",
+	"changelog": "Değişim Günlüğü",
+	"dependencies": "Bağımlılıklar",
+	"noReadme": "README dosyası yok.",
+	"noChangelog": "Değişim günlüğü yok.",
+	"noContributions": "Hiçbir Ekleme Yapmıyor",
+	"noDependencies": "Bağımlılık Yok",
+	"settings": "Ayarlar ({0})",
+	"setting name": "Adı",
+	"description": "Açıklama",
+	"default": "Varsayılan",
+	"debuggers": "Hata Ayıklayıcılar ({0})",
+	"debugger name": "Adı",
+	"debugger type": "Tür",
+	"views": "Görünümler ({0})",
+	"view id": "ID",
+	"view name": "Adı",
+	"view location": "Yeri",
+	"localizations": "Çeviriler ({0})",
+	"localizations language id": "Dil Kimliği",
+	"localizations language name": "Dil Adı",
+	"localizations localized language name": "Dil Adı (Çevrilen Dilde)",
+	"colorThemes": "Renk Temaları ({0})",
+	"iconThemes": "Simge Temaları ({0})",
+	"colors": "Renkler ({0})",
+	"colorId": "Kimlik",
+	"defaultDark": "Koyu Varsayılan",
+	"defaultLight": "Açık Varsayılan",
+	"defaultHC": "Yüksek Karşıtlık Varsayılan",
+	"JSON Validation": "JSON Doğrulama ({0})",
+	"fileMatch": "Dosya Eşleşmesi",
+	"schema": "Şema",
+	"commands": "Komutlar ({0})",
+	"command name": "Adı",
+	"keyboard shortcuts": "Klavye Kısayolları",
+	"menuContexts": "Menü Bağlamları",
+	"languages": "Diller ({0})",
+	"language id": "ID",
+	"language name": "Adı",
+	"file extensions": "Dosya Uzantıları",
+	"grammar": "Gramer",
+	"snippets": "Parçacıklar"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 89dc18d2bf1..8a7b64b5ad3 100644
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,6 @@
 	"recommendedExtensions": "Tavsiye Edilen",
 	"otherRecommendedExtensions": "Diğer Tavsiyeler",
 	"workspaceRecommendedExtensions": "Çalışma Alanı Tavsiyeleri",
-	"builtInExtensions": "Yerleşik",
 	"searchExtensions": "Markette Eklenti Ara",
 	"sort by installs": "Sırala: Yüklenme Sayısına Göre",
 	"sort by rating": "Sırala: Derecelendirmeye Göre",
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index be5917d3287..e0b425c8efd 100644
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,15 +27,11 @@
 	"confirmMoveTrashMessageMultiple": "Aşağıdaki {0} dosyayı silmek istediğinizden emin misiniz?",
 	"confirmMoveTrashMessageFolder": "'{0}' ve içindekileri silmek istediğinizden emin misiniz?",
 	"confirmMoveTrashMessageFile": "'{0}' öğesini silmek istediğinize emin misiniz?",
-	"undoBin": "Geri dönüşüm kutusundan geri alabilirsiniz.",
-	"undoTrash": "Çöp kutusundan geri alabilirsiniz.",
 	"doNotAskAgain": "Bir daha sorma",
 	"confirmDeleteMessageMultiple": "Aşağıdaki {0} dosyayı kalıcı olarak silmek istediğinizden emin misiniz?",
 	"confirmDeleteMessageFolder": "'{0}' öğesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
 	"confirmDeleteMessageFile": "'{0}' öğesini kalıcı olarak silmek istediğinizden emin misiniz?",
 	"irreversible": "Bu eylem geri döndürülemez!",
-	"cancel": "İptal",
-	"permDelete": "Kalıcı Olarak Sil",
 	"importFiles": "Dosya İçe Aktar",
 	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
 	"replaceButtonLabel": "&&Değiştir",
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..7c90e93cddd
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.editor.label": "Html Önizlemesi"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..a11acc39795
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"html.voidInput": "Geçersiz düzenleyici girdisi."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..af6d69fa60e
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"developer": "Geliştirici"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..13712f3e4c5
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"openToolsLabel": "Web Görünümü Geliştirici Araçlarını Aç",
+	"refreshWebviewLabel": "Web Görünümlerini Yeniden Yükle"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index eceab3d45e4..7fe7d2ea049 100644
--- a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"yes": "Evet",
+	"no": "Hayır",
+	"doNotAskAgain": "Bir daha sorma",
 	"JsonSchema.locale": "Kullanılacak Kullanıcı Arayüzü Dili.",
 	"vscode.extension.contributes.localizations": "Düzenleyiciye yerelleştirmeleri ekler",
 	"vscode.extension.contributes.localizations.languageId": "Görüntülenen dizelerin çevrileceği dilin kimliği.",
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..0bdba9b12bf
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"copyMarker": "Kopyala",
+	"copyMarkerMessage": "Mesajı Kopyala"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..03c12e0efce
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.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."
+	],
+	"totalProblems": "Toplam {0} Sorun",
+	"filteredProblems": "{1} Sorundan {0} Tanesi Gösteriliyor"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..a2b9d4cb87b
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"label": "Sorunlar",
+	"tooltip.1": "Bu dosyada 1 sorun var",
+	"tooltip.N": "Bu dosyada {0} sorun var",
+	"markers.showOnFile": "Dosya ve klasörlerde Hata & Uyarıları göster."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..8910520ca78
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,34 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"viewCategory": "Görüntüle",
+	"problems.view.toggle.label": "Sorunları Aç/Kapat (Hatalar, Uyarılar, Bilgiler)",
+	"problems.view.focus.label": "Sorunlara Odakla (Hatalar, Uyarılar, Bilgiler)",
+	"problems.panel.configuration.title": "Sorunlar Görünümü",
+	"problems.panel.configuration.autoreveal": "Sorunlar görünümünün; dosyalar açılırken, dosyaları otomatik olarak ortaya çıkarıp çıkarmayacağını denetler.",
+	"markers.panel.title.problems": "Sorunlar",
+	"markers.panel.aria.label.problems.tree": "Dosyalara göre gruplandırılmış sorunlar",
+	"markers.panel.no.problems.build": "Şu ana kadar çalışma alanında herhangi bir sorun tespit edilmedi.",
+	"markers.panel.no.problems.filters": "Belirtilen süzgeç ölçütleriyle sonuç bulunamadı",
+	"markers.panel.action.filter": "Sorunları Süz",
+	"markers.panel.filter.placeholder": "Türe veya metne göre süz",
+	"markers.panel.filter.errors": "hatalar",
+	"markers.panel.filter.warnings": "uyarılar",
+	"markers.panel.filter.infos": "bilgilendirmeler",
+	"markers.panel.single.error.label": "1 Hata",
+	"markers.panel.multiple.errors.label": "{0} Hata",
+	"markers.panel.single.warning.label": "1 Uyarı",
+	"markers.panel.multiple.warnings.label": "{0} Uyarı",
+	"markers.panel.single.info.label": "1 Bilgilendirme",
+	"markers.panel.multiple.infos.label": "{0} Bilgilendirme",
+	"markers.panel.single.unknown.label": "1 Bilinmeyen",
+	"markers.panel.multiple.unknowns.label": "{0} Bilinmeyen",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} {1} sorun içeriyor",
+	"errors.warnings.show.label": "Hataları ve Uyarıları Göster"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index ddb5af6067c..3aa95c60f2d 100644
--- a/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Çıktı",
 	"logViewer": "Günlük Görüntüleyici",
 	"viewCategory": "Görüntüle",
-	"clearOutput.label": "Çıktıyı Temizle"
+	"clearOutput.label": "Çıktıyı Temizle",
+	"openActiveLogOutputFile": "Görüntüle: Aktif Günlük Dosyasını Aç"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index d655bbf2c91..c9272a2cea6 100644
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,8 +8,6 @@
 	],
 	"nextSearchIncludePattern": "Sonraki Aramaya Dahil Edilen Kalıbı Göster",
 	"previousSearchIncludePattern": "Önceki Aramaya Dahil Edilen Kalıbı Göster",
-	"nextSearchExcludePattern": "Sonraki Aramada Hariç Tutulan Kalıbı Göster",
-	"previousSearchExcludePattern": "Önceki Aramada Hariç Tutulan Kalıbı Göster",
 	"nextSearchTerm": "Sonraki Arama Terimini Göster",
 	"previousSearchTerm": "Önceki Arama Terimini Göster",
 	"showSearchViewlet": "Aramayı Göster",
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
index fc38590cc30..cb483fdd910 100644
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -7,10 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreSearch": "Arama Detaylarını Aç/Kapat",
-	"searchScope.includes": "dahil edilecek dosyalar",
-	"label.includes": "Aramaya Dahil Edilen Kalıplar",
-	"searchScope.excludes": "hariç tutulacak klasörler",
-	"label.excludes": "Aramada Hariç Tutulan Kalıplar",
 	"replaceAll.confirmation.title": "Tümünü Değiştir",
 	"replaceAll.confirm.button": "&&Değiştir",
 	"replaceAll.occurrence.file.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 8edb00a2a6a..5eeb3e4000b 100644
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "Görevi grupsuz olarak atar",
 	"JsonSchema.tasks.group": "Bu görevin ait olduğu çalıştırma grubunu tanımlar. Derleme grubuna eklemek için \"build\"ı ve test grubuna eklemek için \"test\"i destekler.",
 	"JsonSchema.tasks.type": "Görevin bir işlem olarak veya bir kabukta komut olarak çalıştırılıp çalıştırılmayacağını tanımlar.",
+	"JsonSchema.command": "Çalıştırılacak komut. Harici bir program veya bir kabuk komutu olabilir.",
+	"JsonSchema.tasks.args": "Bu görev çağrıldığında, komuta iletilecek argümanlar.",
 	"JsonSchema.tasks.label": "Görevin kullanıcı arayüzü etiketi",
 	"JsonSchema.version": "Yapılandırmanın sürüm numarası.",
 	"JsonSchema.tasks.identifier": "launch.json veya dependsOn maddesindeki göreve atıfta başvuracak, kullanıcı tanımlı bir tanımlayıcı.",
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 1d0ce65d0fb..88cc53075e4 100644
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,11 @@
 	],
 	"tasksCategory": "Görevler",
 	"ConfigureTaskRunnerAction.label": "Görevi Yapılandır",
-	"problems": "Sorunlar",
+	"totalErrors": "{0} Hata",
+	"totalWarnings": "{0} Uyarı",
+	"totalInfos": "{0} Bilgilendirme",
 	"building": "Derleniyor...",
-	"manyMarkers": "99+",
+	"manyProblems": "10b+",
 	"runningTasks": "Çalışan Görevleri Göster",
 	"tasks": "Görevler",
 	"TaskSystem.noHotSwap": "Aktif bir görev çalıştıran görev yürütme motorunu değiştirmek pencereyi yeniden yüklemeyi gerektirir",
@@ -46,8 +48,8 @@
 	"recentlyUsed": "yakınlarda kullanılan görevler",
 	"configured": "yapılandırılmış görevler",
 	"detected": "algılanan görevler",
-	"TaskService.ignoredFolder": "0.1.0 görev sürümünü kullandıkları için şu çalışma alanı klasörleri yok sayıldı: {0}",
 	"TaskService.notAgain": "Tekrar Gösterme",
+	"TaskService.ignoredFolder": "0.1.0 görev sürümünü kullandıkları için şu çalışma alanı klasörleri yok sayıldı: {0}",
 	"TaskService.pickRunTask": "Çalıştırılacak görevi seçin",
 	"TaslService.noEntryToRun": "Çalıştırılacak hiçbir görev bulunamadı. Görevleri Yapılandır...",
 	"TaskService.fetchingBuildTasks": "Derleme görevleri alınıyor...",
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 9c3c1e8fd86..707fc6758f4 100644
--- a/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Hata: ihtiyaç duyulan '{1}' özelliği, '{0}' görev yapılandırmasında eksik. Görev yapılandırması yok sayılacaktır.",
 	"ConfigurationParser.notCustom": "Hata: 'tasks' bir özel görev olarak tanımlanmamış. Yapılandırma yok sayılacaktır.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Hata: bir görev, bir 'label' özelliği belirtmelidir. Görev yok sayılacaktır.\n{0}\n",
-	"taskConfiguration.shellArgs": "Uyarı: '{0}' görevi bir kabuk komutudur ve argümanlarından biri kaçış karakteri içermeyen boşluklar içeriyor olabilir. Doğru komut satırı alıntısını sağlamak için lütfen argümanları komutlarla birleştirin.",
 	"taskConfiguration.noCommandOrDependsOn": "Hata: '{0}' görevi bir komut veya dependsOn özelliği belirtmiyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
 	"taskConfiguration.noCommand": "Hata: '{0}' görevi bir komut tanımlamıyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "2.0.0 görev sürümü genel işletim sistemi özel görevlerini desteklemiyor. Bunları işletim sistemine özel komut içeren bir göreve çevirin. Etkilenen görevler:\n{0}"
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index ad9592dd9e3..f2014fcc12e 100644
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Kopyala",
+	"split": "Böl",
 	"paste": "Yapıştır",
 	"selectAll": "Tümünü Seç",
-	"clear": "Temizle",
-	"split": "Böl"
+	"clear": "Temizle"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..2cfd79cc9e0
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"releaseNotesInputName": "Sürüm Notları: {0}",
+	"unassigned": "atanmamış"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 795a37034f6..c60ad91555b 100644
--- a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"later": "Daha Sonra",
-	"unassigned": "atanmamış",
 	"releaseNotes": "Sürüm Notları",
 	"showReleaseNotes": "Sürüm Notlarını Göster",
 	"read the release notes": "{0} v{1} uygulamasına hoş geldiniz! Sürüm Notları'nı okumak ister misiniz?",
diff --git a/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..4c6d2775a03
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"webview.editor.label": "web görünümü düzenleyicisi"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..271702f6cc6
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"telemetryOptOut.readMore": "Devamını oku"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	]
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..c9b9ed878f8
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the MIT License. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"yesButton": "&&Evet",
+	"cancelButton": "İptal"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 13fc407f066..4d4a6d071a8 100644
--- a/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -10,7 +10,6 @@
 	"neverShowAgain": "Tekrar Gösterme",
 	"netVersionError": "Microsoft .NET Framework 4.5 gerekli. Yüklemek için bağlantıyı izleyin.",
 	"learnMore": "Talimatlar",
-	"enospcError": "{0} için dosya işleçleri bitiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
 	"binFailed": "'{0}' geri dönüşüm kutusuna taşınamadı",
 	"trashFailed": "'{0}' çöpe taşınamadı"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
index a9f7d643231..0032045d6c1 100644
--- a/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
 	"fileIsDirectoryError": "Dosya bir dizindir",
 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-	"fileTooLargeForHeapError": "Dosya boyutu pencere bellek sınırını aşıyor, lütfen code --max-memory=YENIBOYUT komutunu çalıştırın",
 	"fileTooLargeError": "Dosya, açmak için çok büyük",
 	"fileNotFoundError": "Dosya bulunamadı ({0})",
 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
diff --git a/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..4e6920ae96e 100644
--- a/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "İptal"
 }
\ No newline at end of file

From 5e6decf62a62464499a4d1a22c88299ee12afc85 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 28 Mar 2018 18:27:57 -0700
Subject: [PATCH 191/383] Fix #46828 - show both search result count badge and
 action buttons in wide mode

---
 .../parts/search/browser/media/searchview.css | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/media/searchview.css b/src/vs/workbench/parts/search/browser/media/searchview.css
index 9592001ebe8..11d4a566ac9 100644
--- a/src/vs/workbench/parts/search/browser/media/searchview.css
+++ b/src/vs/workbench/parts/search/browser/media/searchview.css
@@ -184,10 +184,10 @@
 	flex: 1;
 }
 
-.search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .foldermatch .monaco-icon-label,
-.search-view .monaco-tree .monaco-tree-row.focused .foldermatch .monaco-icon-label,
-.search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .filematch .monaco-icon-label,
-.search-view .monaco-tree .monaco-tree-row.focused .filematch .monaco-icon-label {
+.search-view:not(.wide) .monaco-tree .monaco-tree-row:hover:not(.highlighted) .foldermatch .monaco-icon-label,
+.search-view:not(.wide) .monaco-tree .monaco-tree-row.focused .foldermatch .monaco-icon-label,
+.search-view:not(.wide) .monaco-tree .monaco-tree-row:hover:not(.highlighted) .filematch .monaco-icon-label,
+.search-view:not(.wide) .monaco-tree .monaco-tree-row.focused .filematch .monaco-icon-label {
 	flex: 1;
 }
 
@@ -282,15 +282,24 @@
 	margin-right: 12px;
 }
 
-.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .monaco-count-badge,
-.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .monaco-count-badge,
-.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .monaco-count-badge,
-.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .monaco-count-badge,
-.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
-.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .monaco-count-badge {
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .monaco-count-badge {
 	display: none;
 }
 
+.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .badge {
+	flex: 1;
+}
+
 .search-view .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .action-remove,
 .vs-dark .monaco-workbench .search-view .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .action-remove {
 	background: url("action-remove-focus.svg") center center no-repeat;

From 89b196e08fad43d6edb3a93ef75d629ba27094c3 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Wed, 28 Mar 2018 19:39:30 -0700
Subject: [PATCH 192/383] Publisher info is now considered SystemMetaData

---
 .../common/extensionManagementUtil.ts             | 15 ++++++---------
 .../workbench/api/node/extHostExtensionService.ts |  4 +---
 .../electron-browser/workbenchThemeService.ts     |  4 +---
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 54fcf01e4d9..7d1bd38ba36 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -69,6 +69,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		id: getGalleryExtensionIdFromLocal(extension),
 		name: extension.manifest.name,
 		galleryId: null,
+		publisherId: extension.metadata ? extension.metadata.publisherId : null,
+		publisherName: extension.manifest.publisher,
+		publisherDisplayName: extension.metadata ? extension.metadata.publisherDisplayName : null,
 		dependencies: extension.manifest.extensionDependencies && extension.manifest.extensionDependencies.length > 0
 	};
 }
@@ -79,12 +82,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"name": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"galleryId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		"publisherId": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-		"publisherName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-		"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-		"galleryPublisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"galleryPublisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		"publisherId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"dependencies": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 		"${include}": [
 			"${GalleryExtensionTelemetryData2}"
@@ -99,9 +99,6 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension):
 		publisherId: extension.publisherId,
 		publisherName: extension.publisher,
 		publisherDisplayName: extension.publisherDisplayName,
-		galleryPublisherId: extension.publisherId,
-		galleryPublisherName: extension.publisher,
-		galleryPublisherDisplayName: extension.publisherDisplayName,
 		dependencies: extension.properties.dependencies.length > 0,
 		...extension.telemetryData
 	};
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 949c69abdca..25e95031280 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -423,8 +423,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 		"TelemetryActivationEvent" : {
 			"id": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 			"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-			"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-			"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+			"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"activationEvents": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		}
@@ -433,7 +432,6 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 		id: extensionDescription.id,
 		name: extensionDescription.name,
 		publisherDisplayName: extensionDescription.publisher,
-		galleryPublisherDisplayName: extensionDescription.publisher,
 		activationEvents: extensionDescription.activationEvents ? extensionDescription.activationEvents.join(',') : null,
 		isBuiltin: extensionDescription.isBuiltin
 	};
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 9c91aa72e6f..6e1bab75448 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -362,8 +362,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 						"id" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-						"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-						"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+						"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 						"themeId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 					}
 				*/
@@ -372,7 +371,6 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 					name: themeData.extensionName,
 					isBuiltin: themeData.extensionIsBuiltin,
 					publisherDisplayName: themeData.extensionPublisher,
-					galleryPublisherDisplayName: themeData.extensionPublisher,
 					themeId: themeId
 				});
 				this.themeExtensionsActivated.set(key, true);

From 952b2a641da89a6c7bc28387474bc8afd47f0d2f Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 28 Mar 2018 21:01:41 -0700
Subject: [PATCH 193/383] Bump node2

---
 build/builtInExtensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index ddd3c9e44be..4fa344c81a9 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -6,7 +6,7 @@
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.22.5",
+		"version": "1.22.6",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
 ]
\ No newline at end of file

From b5f63bb2fb9e771921b69d5f6d619368787aa419 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Thu, 29 Mar 2018 07:50:23 +0200
Subject: [PATCH 194/383] Fixes #45261: Shell tasks force terminal window
 regardless of presentation setting

---
 .../parts/tasks/electron-browser/terminalTaskSystem.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index 02621b26855..d0cb9e4f524 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -380,8 +380,8 @@ export class TerminalTaskSystem implements ITaskSystem {
 		if (!terminal) {
 			return TPromise.wrapError<ITaskSummary>(new Error(`Failed to create terminal for task ${task._label}`));
 		}
-		this.terminalService.setActiveInstance(terminal);
 		if (task.command.presentation.reveal === RevealKind.Always || (task.command.presentation.reveal === RevealKind.Silent && task.problemMatchers.length === 0)) {
+			this.terminalService.setActiveInstance(terminal);
 			this.terminalService.showPanel(task.command.presentation.focus);
 		}
 		this.activeTasks[Task.getMapKey(task)] = { terminal, task, promise };

From bb49e6e3c0317e23f01bdd01010dd48d27cc67fe Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 10:42:08 +0200
Subject: [PATCH 195/383] fix #46880

---
 src/vs/vscode.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 672f56eb55b..243d44f73e5 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -3749,29 +3749,29 @@ declare module 'vscode' {
 		 */
 		message: string;
 
-		/**
-		 * A human-readable string describing the source of this
-		 * diagnostic, e.g. 'typescript' or 'super lint'.
-		 */
-		source: string;
-
 		/**
 		 * The severity, default is [error](#DiagnosticSeverity.Error).
 		 */
 		severity: DiagnosticSeverity;
 
+		/**
+		 * A human-readable string describing the source of this
+		 * diagnostic, e.g. 'typescript' or 'super lint'.
+		 */
+		source?: string;
+
 		/**
 		 * A code or identifier for this diagnostics. Will not be surfaced
 		 * to the user, but should be used for later processing, e.g. when
 		 * providing [code actions](#CodeActionContext).
 		 */
-		code: string | number;
+		code?: string | number;
 
 		/**
 		 * An array of related diagnostic information, e.g. when symbol-names within
 		 * a scope collide all definitions can be marked via this property.
 		 */
-		relatedInformation: DiagnosticRelatedInformation[];
+		relatedInformation?: DiagnosticRelatedInformation[];
 
 		/**
 		 * Creates a new diagnostic object.

From 98d0b747c2ff33513cb4a1b5b6432b1ac338a958 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 12:16:20 +0200
Subject: [PATCH 196/383] fix #46239

---
 .../api/electron-browser/mainThreadFileSystem.ts    | 13 ++++++++-----
 src/vs/workbench/api/node/extHost.protocol.ts       |  4 ++--
 src/vs/workbench/api/node/extHostFileSystem.ts      | 13 +++++++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
index df14909d35f..35ea17279f0 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
@@ -56,8 +56,8 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape {
 		this._fileProvider.get(handle).$onFileSystemChange(changes);
 	}
 
-	$reportFileChunk(handle: number, session: number, chunk: number[]): void {
-		this._fileProvider.get(handle).reportFileChunk(session, chunk);
+	$reportFileChunk(handle: number, session: number, base64Chunk: string): void {
+		this._fileProvider.get(handle).reportFileChunk(session, base64Chunk);
 	}
 
 	// --- search
@@ -126,11 +126,14 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 			return value;
 		});
 	}
-	reportFileChunk(session: number, chunk: number[]): void {
-		this._reads.get(session).progress.report(Buffer.from(chunk));
+	reportFileChunk(session: number, encodedChunk: string): void {
+		this._reads.get(session).progress.report(Buffer.from(encodedChunk, 'base64'));
 	}
 	write(resource: URI, content: Uint8Array): TPromise<void, any> {
-		return this._proxy.$write(this._handle, resource, [].slice.call(content));
+		let encoded = Buffer.isBuffer(content)
+			? content.toString('base64')
+			: Buffer.from(content.buffer).toString('base64');
+		return this._proxy.$write(this._handle, resource, encoded);
 	}
 	unlink(resource: URI): TPromise<void, any> {
 		return this._proxy.$unlink(this._handle, resource);
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 1a1336e3367..fe1dfcdb6ed 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -382,7 +382,7 @@ export interface MainThreadFileSystemShape extends IDisposable {
 	$unregisterProvider(handle: number): void;
 
 	$onFileSystemChange(handle: number, resource: IFileChangeDto[]): void;
-	$reportFileChunk(handle: number, session: number, chunk: number[] | null): void;
+	$reportFileChunk(handle: number, session: number, base64Encoded: string | null): void;
 
 	$handleFindMatch(handle: number, session, data: UriComponents | [UriComponents, ILineMatch]): void;
 }
@@ -561,7 +561,7 @@ export interface ExtHostFileSystemShape {
 	$utimes(handle: number, resource: UriComponents, mtime: number, atime: number): TPromise<IStat>;
 	$stat(handle: number, resource: UriComponents): TPromise<IStat>;
 	$read(handle: number, session: number, offset: number, count: number, resource: UriComponents): TPromise<number>;
-	$write(handle: number, resource: UriComponents, content: number[]): TPromise<void>;
+	$write(handle: number, resource: UriComponents, base64Encoded: string): TPromise<void>;
 	$unlink(handle: number, resource: UriComponents): TPromise<void>;
 	$move(handle: number, resource: UriComponents, target: UriComponents): TPromise<IStat>;
 	$mkdir(handle: number, resource: UriComponents): TPromise<IStat>;
diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts
index 00dfa69b6df..5d8499e44fb 100644
--- a/src/vs/workbench/api/node/extHostFileSystem.ts
+++ b/src/vs/workbench/api/node/extHostFileSystem.ts
@@ -15,6 +15,7 @@ import { IPatternInfo } from 'vs/platform/search/common/search';
 import { values } from 'vs/base/common/map';
 import { Range } from 'vs/workbench/api/node/extHostTypes';
 import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
+import { IProgress } from 'vs/platform/progress/common/progress';
 
 class FsLinkProvider implements vscode.DocumentLinkProvider {
 
@@ -109,15 +110,19 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		return asWinJsPromise(token => this._fsProvider.get(handle).stat(URI.revive(resource)));
 	}
 	$read(handle: number, session: number, offset: number, count: number, resource: UriComponents): TPromise<number> {
-		const progress = {
+		const progress: IProgress<Uint8Array> = {
 			report: chunk => {
-				this._proxy.$reportFileChunk(handle, session, [].slice.call(chunk));
+				let base64Chunk = Buffer.isBuffer(chunk)
+					? chunk.toString('base64')
+					: Buffer.from(chunk.buffer).toString('base64');
+
+				this._proxy.$reportFileChunk(handle, session, base64Chunk);
 			}
 		};
 		return asWinJsPromise(token => this._fsProvider.get(handle).read(URI.revive(resource), offset, count, progress));
 	}
-	$write(handle: number, resource: UriComponents, content: number[]): TPromise<void, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).write(URI.revive(resource), Buffer.from(content)));
+	$write(handle: number, resource: UriComponents, base64Content: string): TPromise<void, any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).write(URI.revive(resource), Buffer.from(base64Content, 'base64')));
 	}
 	$unlink(handle: number, resource: UriComponents): TPromise<void, any> {
 		return asWinJsPromise(token => this._fsProvider.get(handle).unlink(URI.revive(resource)));

From 99bd3766b7514f101309ab12525890cb09be3aed Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 12:42:24 +0200
Subject: [PATCH 197/383] fix #43052

---
 src/vs/workbench/api/electron-browser/mainThreadErrors.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadErrors.ts b/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
index a1ff2a2dd6c..6c283a0d98c 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
@@ -16,7 +16,7 @@ export class MainThreadErrors implements MainThreadErrorsShape {
 	}
 
 	$onUnexpectedError(err: any | SerializedError): void {
-		if (err.$isError) {
+		if (err && err.$isError) {
 			const { name, message, stack } = err;
 			err = new Error();
 			err.message = message;

From c26b220e799f6f99e876bdc18da758acd2300d87 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 29 Mar 2018 12:45:40 +0200
Subject: [PATCH 198/383] Fixes #45096: Write previous word in textare on OSX

---
 .../browser/controller/textAreaHandler.ts     | 45 ++++++++++++++++---
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
index cf5620fdb7c..c8cfc5590e1 100644
--- a/src/vs/editor/browser/controller/textAreaHandler.ts
+++ b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -27,6 +27,7 @@ import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/line
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
 import { EndOfLinePreference } from 'vs/editor/common/model';
+import { getMapForWordSeparators, WordCharacterClass } from 'vs/editor/common/controller/wordCharacterClassifier';
 
 export interface ITextAreaHandlerHelper {
 	visibleRangeForPositionRelativeToEditor(lineNumber: number, column: number): HorizontalRange;
@@ -203,16 +204,19 @@ export class TextAreaHandler extends ViewPart {
 				if (this._accessibilitySupport === platform.AccessibilitySupport.Disabled) {
 					// We know for a fact that a screen reader is not attached
 					// On OSX, we write the character before the cursor to allow for "long-press" composition
+					// Also on OSX, we write the word before the cursor to allow for the Accessibility Keyboard to give good hints
 					if (platform.isMacintosh) {
 						const selection = this._selections[0];
 						if (selection.isEmpty()) {
 							const position = selection.getStartPosition();
-							if (position.column > 1) {
-								const lineContent = this._context.model.getLineContent(position.lineNumber);
-								const charBefore = lineContent.charAt(position.column - 2);
-								if (!strings.isHighSurrogate(charBefore.charCodeAt(0))) {
-									return new TextAreaState(charBefore, 1, 1, position, position);
-								}
+
+							let textBefore = this._getWordBeforePosition(position);
+							if (textBefore.length === 0) {
+								textBefore = this._getCharacterBeforePosition(position);
+							}
+
+							if (textBefore.length > 0) {
+								return new TextAreaState(textBefore, textBefore.length, textBefore.length, position, position);
 							}
 						}
 					}
@@ -328,6 +332,35 @@ export class TextAreaHandler extends ViewPart {
 		super.dispose();
 	}
 
+	private _getWordBeforePosition(position: Position): string {
+		const lineContent = this._context.model.getLineContent(position.lineNumber);
+		const wordSeparators = getMapForWordSeparators(this._context.configuration.editor.wordSeparators);
+
+		let column = position.column;
+		let distance = 0;
+		while (column > 1) {
+			const charCode = lineContent.charCodeAt(column - 2);
+			const charClass = wordSeparators.get(charCode);
+			if (charClass !== WordCharacterClass.Regular || distance > 50) {
+				return lineContent.substring(column - 1, position.column - 1);
+			}
+			distance++;
+			column--;
+		}
+		return lineContent.substring(0, position.column - 1);
+	}
+
+	private _getCharacterBeforePosition(position: Position): string {
+		if (position.column > 1) {
+			const lineContent = this._context.model.getLineContent(position.lineNumber);
+			const charBefore = lineContent.charAt(position.column - 2);
+			if (!strings.isHighSurrogate(charBefore.charCodeAt(0))) {
+				return charBefore;
+			}
+		}
+		return '';
+	}
+
 	// --- begin event handlers
 
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

From 789b345ee02ea1e1ad4ced04bd44ffa0fdad1102 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 12:49:18 +0200
Subject: [PATCH 199/383] fix #41081 - cancel action computation when editor
 goes off-dom

---
 src/vs/editor/contrib/quickFix/quickFixWidget.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/vs/editor/contrib/quickFix/quickFixWidget.ts b/src/vs/editor/contrib/quickFix/quickFixWidget.ts
index 1fd65fa824b..aa223cc3cda 100644
--- a/src/vs/editor/contrib/quickFix/quickFixWidget.ts
+++ b/src/vs/editor/contrib/quickFix/quickFixWidget.ts
@@ -15,6 +15,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { Action } from 'vs/base/common/actions';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ScrollType } from 'vs/editor/common/editorCommon';
+import { canceled } from 'vs/base/common/errors';
 
 export class QuickFixContextMenu {
 
@@ -39,6 +40,12 @@ export class QuickFixContextMenu {
 						() => this._onDidExecuteCodeAction.fire(undefined));
 				});
 			});
+		}).then(actions => {
+			if (!this._editor.getDomNode()) {
+				// cancel when editor went off-dom
+				return TPromise.wrapError<any>(canceled());
+			}
+			return actions;
 		});
 
 		this._contextMenuService.showContextMenu({

From b670f87518ccd4165206e18c40c76d94b053e5c6 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Thu, 29 Mar 2018 12:50:38 +0200
Subject: [PATCH 200/383] bring back listInactiveFocusBackground

---
 src/vs/platform/theme/common/colorRegistry.ts | 1 +
 src/vs/platform/theme/common/styler.ts        | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 66aad012e30..0c86fecab82 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -196,6 +196,7 @@ export const listActiveSelectionBackground = registerColor('list.activeSelection
 export const listActiveSelectionForeground = registerColor('list.activeSelectionForeground', { dark: Color.white, light: Color.white, hc: null }, nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#3F3F46', light: '#CCCEDB', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionForeground = registerColor('list.inactiveSelectionForeground', { dark: null, light: null, hc: null }, nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
+export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground', { dark: '#313135', light: '#d8dae6', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
 export const listHoverForeground = registerColor('list.hoverForeground', { dark: null, light: null, hc: null }, nls.localize('listHoverForeground', "List/Tree foreground when hovering over items using the mouse."));
 export const listDropBackground = registerColor('list.dropBackground', { dark: listFocusBackground, light: listFocusBackground, hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
index 0b2f83624b6..07dfd1d9551 100644
--- a/src/vs/platform/theme/common/styler.ts
+++ b/src/vs/platform/theme/common/styler.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, lighten, badgeBackground, badgeForeground, progressBarBackground } from 'vs/platform/theme/common/colorRegistry';
+import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, lighten, badgeBackground, badgeForeground, progressBarBackground } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
@@ -183,7 +183,7 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
 		listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listActiveSelectionForeground,
 		listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || listInactiveSelectionBackground,
 		listInactiveSelectionForeground: (style && style.listInactiveSelectionForeground) || listInactiveSelectionForeground,
-		listInactiveFocusBackground: (style && style.listInactiveFocusBackground),
+		listInactiveFocusBackground: (style && style.listInactiveFocusBackground) || listInactiveFocusBackground,
 		listHoverBackground: (style && style.listHoverBackground) || listHoverBackground,
 		listHoverForeground: (style && style.listHoverForeground) || listHoverForeground,
 		listDropBackground: (style && style.listDropBackground) || listDropBackground,
@@ -225,6 +225,7 @@ export const defaultListStyles: IColorMapping = {
 	listFocusAndSelectionForeground: listActiveSelectionForeground,
 	listInactiveSelectionBackground: listInactiveSelectionBackground,
 	listInactiveSelectionForeground: listInactiveSelectionForeground,
+	listInactiveFocusBackground: listInactiveFocusBackground,
 	listHoverBackground: listHoverBackground,
 	listHoverForeground: listHoverForeground,
 	listDropBackground: listDropBackground,

From d689094a115ab8eac8a40e94ec2478b2203c4e0e Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 12:52:03 +0200
Subject: [PATCH 201/383] fix  #43559

---
 .../referenceSearch/referencesController.ts   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
index 88079826a6d..349e1eb662c 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -155,16 +155,17 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 
 			// show widget
 			return this._widget.setModel(this._model).then(() => {
+				if (this._widget) { // might have been closed
+					// set title
+					this._widget.setMetaTitle(options.getMetaTitle(this._model));
 
-				// set title
-				this._widget.setMetaTitle(options.getMetaTitle(this._model));
-
-				// set 'best' selection
-				let uri = this._editor.getModel().uri;
-				let pos = new Position(range.startLineNumber, range.startColumn);
-				let selection = this._model.nearestReference(uri, pos);
-				if (selection) {
-					return this._widget.setSelection(selection);
+					// set 'best' selection
+					let uri = this._editor.getModel().uri;
+					let pos = new Position(range.startLineNumber, range.startColumn);
+					let selection = this._model.nearestReference(uri, pos);
+					if (selection) {
+						return this._widget.setSelection(selection);
+					}
 				}
 				return undefined;
 			});

From aec9a5e0651d528fb281d49d1e5308f57d17862d Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 12:57:14 +0200
Subject: [PATCH 202/383] fix #42602

---
 src/vs/workbench/api/node/extHostDecorations.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/api/node/extHostDecorations.ts b/src/vs/workbench/api/node/extHostDecorations.ts
index 89987b137bb..77d9b441fc8 100644
--- a/src/vs/workbench/api/node/extHostDecorations.ts
+++ b/src/vs/workbench/api/node/extHostDecorations.ts
@@ -43,6 +43,10 @@ export class ExtHostDecorations implements ExtHostDecorationsShape {
 		return TPromise.join(requests.map(request => {
 			const { handle, uri, id } = request;
 			const provider = this._provider.get(handle);
+			if (!provider) {
+				// might have been unregistered in the meantime
+				return void 0;
+			}
 			return asWinJsPromise(token => provider.provideDecoration(URI.revive(uri), token)).then(data => {
 				result[id] = data && <DecorationData>[data.priority, data.bubble, data.title, data.abbreviation, data.color, data.source];
 			}, err => {

From f50b6d7f1391236123b033913025d7153c479b71 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 29 Mar 2018 15:03:49 +0200
Subject: [PATCH 203/383] Show Select All unchecked when none visible (fixes
 #46927)

---
 .../parts/quickinput/quickInputCheckboxList.ts     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 626ba4fe499..4d6ce547687 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -202,17 +202,21 @@ export class QuickInputCheckboxList {
 	}
 
 	getAllVisibleChecked() {
-		return this.allVisibleChecked(this.elements);
+		return this.allVisibleChecked(this.elements, false);
 	}
 
-	private allVisibleChecked(elements: CheckableElement[]) {
+	private allVisibleChecked(elements: CheckableElement[], whenNoneVisible = true) {
 		for (let i = 0, n = elements.length; i < n; i++) {
 			const element = elements[i];
-			if (!element.hidden && !element.checked) {
-				return false;
+			if (!element.hidden) {
+				if (!element.checked) {
+					return false;
+				} else {
+					whenNoneVisible = true;
+				}
 			}
 		}
-		return true;
+		return whenNoneVisible;
 	}
 
 	getCheckedCount() {

From 3462420866060614fe1a929ff8fb65972f484edb Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 15:15:04 +0200
Subject: [PATCH 204/383] cap textual suggestions at 10k, #46930

---
 .../common/services/editorSimpleWorker.ts     | 87 ++++++++++++-------
 .../services/editorSimpleWorker.test.ts       | 21 +++++
 2 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index b7302571032..046b0f32902 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -22,6 +22,7 @@ import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model
 import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase';
 import { IWordAtPosition, EndOfLineSequence } from 'vs/editor/common/model';
 import { globals } from 'vs/base/common/platform';
+import { IIterator } from 'vs/base/common/iterator';
 
 export interface IMirrorModel {
 	readonly uri: URI;
@@ -58,8 +59,8 @@ export interface ICommonModel {
 	getLinesContent(): string[];
 	getLineCount(): number;
 	getLineContent(lineNumber: number): string;
+	createWordIterator(wordDefinition: RegExp): IIterator<string>;
 	getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition;
-	getAllUniqueWords(wordDefinition: RegExp, skipWordOnce?: string): string[];
 	getValueInRange(range: IRange): string;
 	getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range;
 	offsetAt(position: IPosition): number;
@@ -146,30 +147,37 @@ class MirrorModel extends BaseMirrorModel implements ICommonModel {
 		};
 	}
 
-	private _getAllWords(wordDefinition: RegExp): string[] {
-		let result: string[] = [];
-		this._lines.forEach((line) => {
-			this._wordenize(line, wordDefinition).forEach((info) => {
-				result.push(line.substring(info.start, info.end));
-			});
-		});
-		return result;
-	}
+	public createWordIterator(wordDefinition: RegExp): IIterator<string> {
+		let obj = {
+			done: false,
+			value: ''
+		};
+		let lineNumber = 0;
+		let lineText: string;
+		let wordRangesIdx = 0;
+		let wordRanges: IWordRange[] = [];
+		let next = () => {
+
+			if (wordRangesIdx < wordRanges.length) {
+				obj.done = false;
+				obj.value = lineText.substring(wordRanges[wordRangesIdx].start, wordRanges[wordRangesIdx].end);
+				wordRangesIdx += 1;
+
+			} else if (lineNumber >= this._lines.length) {
+				obj.done = true;
+				obj.value = undefined;
 
-	public getAllUniqueWords(wordDefinition: RegExp, skipWordOnce?: string): string[] {
-		let foundSkipWord = false;
-		let uniqueWords = Object.create(null);
-		return this._getAllWords(wordDefinition).filter((word) => {
-			if (skipWordOnce && !foundSkipWord && skipWordOnce === word) {
-				foundSkipWord = true;
-				return false;
-			} else if (uniqueWords[word]) {
-				return false;
 			} else {
-				uniqueWords[word] = true;
-				return true;
+				lineText = this._lines[lineNumber];
+				wordRanges = this._wordenize(lineText, wordDefinition);
+				wordRangesIdx = 0;
+				lineNumber += 1;
+				return next();
 			}
-		});
+
+			return obj;
+		};
+		return { next };
 	}
 
 	private _wordenize(content: string, wordDefinition: RegExp): IWordRange[] {
@@ -427,6 +435,8 @@ export abstract class BaseEditorSimpleWorker {
 
 	// ---- BEGIN suggest --------------------------------------------------------------------------
 
+	private static readonly _suggestionsLimit = 10000;
+
 	public textualSuggest(modelUrl: string, position: IPosition, wordDef: string, wordDefFlags: string): TPromise<ISuggestResult> {
 		const model = this._getModel(modelUrl);
 		if (model) {
@@ -434,17 +444,32 @@ export abstract class BaseEditorSimpleWorker {
 			const wordDefRegExp = new RegExp(wordDef, wordDefFlags);
 			const currentWord = model.getWordUntilPosition(position, wordDefRegExp).word;
 
-			for (const word of model.getAllUniqueWords(wordDefRegExp)) {
-				if (word !== currentWord && isNaN(Number(word))) {
-					suggestions.push({
-						type: 'text',
-						label: word,
-						insertText: word,
-						noAutoAccept: true,
-						overwriteBefore: currentWord.length
-					});
+			const seen: Record<string, boolean> = Object.create(null);
+			seen[currentWord] = true;
+
+			for (
+				let iter = model.createWordIterator(wordDefRegExp), e = iter.next();
+				!e.done && suggestions.length <= BaseEditorSimpleWorker._suggestionsLimit;
+				e = iter.next()
+			) {
+				const word = e.value;
+				if (seen[word]) {
+					continue;
 				}
+				seen[word] = true;
+				if (!isNaN(Number(word))) {
+					continue;
+				}
+
+				suggestions.push({
+					type: 'text',
+					label: word,
+					insertText: word,
+					noAutoAccept: true,
+					overwriteBefore: currentWord.length
+				});
 			}
+
 			return TPromise.as({ suggestions });
 		}
 		return undefined;
diff --git a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
index 0a8b62e8a55..0d55c58d7c1 100644
--- a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
+++ b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
@@ -168,4 +168,25 @@ suite('EditorSimpleWorker', () => {
 			assert.equal(suggestions[0].label, 'foobar');
 		});
 	});
+
+	test('get words via iterator, issue #46930', function () {
+
+		let model = worker.addModel([
+			'one line',	// 1
+			'two line',	// 2
+			'',
+			'past empty',
+			'single',
+			'',
+			'and now we are done'
+		]);
+
+		let words: string[] = [];
+
+		for (let iter = model.createWordIterator(/[a-z]+/img), e = iter.next(); !e.done; e = iter.next()) {
+			words.push(e.value);
+		}
+
+		assert.deepEqual(words, ['one', 'line', 'two', 'line', 'past', 'empty', 'single', 'and', 'now', 'we', 'are', 'done']);
+	});
 });

From 11f5d549dbb69db924122a3d1131979e1c6bc795 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 29 Mar 2018 15:20:30 +0200
Subject: [PATCH 205/383] [css] path completion sometimes only works for one
 folder level. Fixes #46722

---
 .../server/src/pathCompletion.ts              | 13 ++---
 .../server/src/test/completion.test.ts        | 40 ++++++++++++---
 .../server/src/modes/pathCompletion.ts        | 13 ++---
 .../server/src/test/completions.test.ts       | 49 ++++++++++++++++++-
 .../about/media/icon.pic                      |  4 ++
 5 files changed, 94 insertions(+), 25 deletions(-)
 create mode 100644 extensions/html-language-features/server/src/test/pathCompletionFixtures/about/media/icon.pic

diff --git a/extensions/css-language-features/server/src/pathCompletion.ts b/extensions/css-language-features/server/src/pathCompletion.ts
index 2f840184a14..1f8ddfc2df1 100644
--- a/extensions/css-language-features/server/src/pathCompletion.ts
+++ b/extensions/css-language-features/server/src/pathCompletion.ts
@@ -54,16 +54,11 @@ export function providePathSuggestions(value: string, range: Range, activeDocFsP
 		replaceRange = getReplaceRange(range, valueAfterLastSlash);
 	}
 
-	let parentDir: string;
-	if (lastIndexOfSlash === -1) {
-		parentDir = path.resolve(root);
-	} else {
-		const valueBeforeLastSlash = value.slice(0, lastIndexOfSlash + 1);
+	const valueBeforeLastSlash = value.slice(0, lastIndexOfSlash + 1);
 
-		parentDir = startsWith(value, '/')
-			? path.resolve(root, '.' + valueBeforeLastSlash)
-			: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
-	}
+	const parentDir = startsWith(value, '/')
+		? path.resolve(root, '.' + valueBeforeLastSlash)
+		: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
 
 	try {
 		return fs.readdirSync(parentDir).map(f => {
diff --git a/extensions/css-language-features/server/src/test/completion.test.ts b/extensions/css-language-features/server/src/test/completion.test.ts
index 82f1af7026d..86f57ca523d 100644
--- a/extensions/css-language-features/server/src/test/completion.test.ts
+++ b/extensions/css-language-features/server/src/test/completion.test.ts
@@ -41,7 +41,7 @@ suite('Completions', () => {
 		const position = document.positionAt(offset);
 
 		if (!workspaceFolders) {
-			workspaceFolders = [{ name: 'x', uri: path.dirname(testUri) }];
+			workspaceFolders = [{ name: 'x', uri: testUri.substr(0, testUri.lastIndexOf('/')) }];
 		}
 
 		let participantResult = CompletionList.create([]);
@@ -62,13 +62,14 @@ suite('Completions', () => {
 	}
 
 	test('CSS Path completion', function () {
-		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).fsPath;
+		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString();
+		let folders = [{ name: 'x', uri: Uri.file(path.resolve(__dirname, '../../test')).toString() }];
 
 		assertCompletions('html { background-image: url("./|")', {
 			items: [
 				{ label: 'about.html', resultText: 'html { background-image: url("./about.html")' }
 			]
-		}, testUri);
+		}, testUri, folders);
 
 		assertCompletions(`html { background-image: url('../|')`, {
 			items: [
@@ -76,7 +77,7 @@ suite('Completions', () => {
 				{ label: 'index.html', resultText: `html { background-image: url('../index.html')` },
 				{ label: 'src/', resultText: `html { background-image: url('../src/')` }
 			]
-		}, testUri);
+		}, testUri, folders);
 
 		assertCompletions(`html { background-image: url('../src/a|')`, {
 			items: [
@@ -84,12 +85,39 @@ suite('Completions', () => {
 				{ label: 'data/', resultText: `html { background-image: url('../src/data/')` },
 				{ label: 'test.js', resultText: `html { background-image: url('../src/test.js')` }
 			]
-		}, testUri);
+		}, testUri, folders);
 
 		assertCompletions(`html { background-image: url('../src/data/f|.asar')`, {
 			items: [
 				{ label: 'foo.asar', resultText: `html { background-image: url('../src/data/foo.asar')` }
 			]
-		}, testUri);
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('|')`, {
+			items: [
+				{ label: 'about.css', resultText: `html { background-image: url('about.css')` },
+				{ label: 'about.html', resultText: `html { background-image: url('about.html')` },
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('/|')`, {
+			items: [
+				{ label: 'pathCompletionFixtures/', resultText: `html { background-image: url('/pathCompletionFixtures/')` }
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('/pathCompletionFixtures/|')`, {
+			items: [
+				{ label: 'about/', resultText: `html { background-image: url('/pathCompletionFixtures/about/')` },
+				{ label: 'index.html', resultText: `html { background-image: url('/pathCompletionFixtures/index.html')` },
+				{ label: 'src/', resultText: `html { background-image: url('/pathCompletionFixtures/src/')` }
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url("/|")`, {
+			items: [
+				{ label: 'pathCompletionFixtures/', resultText: `html { background-image: url("/pathCompletionFixtures/")` }
+			]
+		}, testUri, folders);
 	});
 });
\ No newline at end of file
diff --git a/extensions/html-language-features/server/src/modes/pathCompletion.ts b/extensions/html-language-features/server/src/modes/pathCompletion.ts
index 10e4649a0e3..139ecc9a25c 100644
--- a/extensions/html-language-features/server/src/modes/pathCompletion.ts
+++ b/extensions/html-language-features/server/src/modes/pathCompletion.ts
@@ -69,16 +69,11 @@ function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?:
 	}
 
 	const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
-	let parentDir: string;
-	if (lastIndexOfSlash === -1) {
-		parentDir = path.resolve(root);
-	} else {
-		const valueBeforeLastSlash = valueBeforeCursor.slice(0, lastIndexOfSlash + 1);
+	const valueBeforeLastSlash = valueBeforeCursor.slice(0, lastIndexOfSlash + 1);
 
-		parentDir = startsWith(valueBeforeCursor, '/')
-			? path.resolve(root, '.' + valueBeforeLastSlash)
-			: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
-	}
+	const parentDir = startsWith(valueBeforeCursor, '/')
+		? path.resolve(root, '.' + valueBeforeLastSlash)
+		: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
 
 	try {
 		return fs.readdirSync(parentDir).map(f => {
diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts
index 23b119eb826..1b2b2076ead 100644
--- a/extensions/html-language-features/server/src/test/completions.test.ts
+++ b/extensions/html-language-features/server/src/test/completions.test.ts
@@ -166,6 +166,7 @@ suite('HTML Path Completion', () => {
 	});
 
 	test('Empty Path Value', () => {
+		// document: index.html
 		testCompletionFor('<script src="|">', {
 			items: [
 				{ label: 'about/', resultText: '<script src="about/">' },
@@ -173,8 +174,15 @@ suite('HTML Path Completion', () => {
 				{ label: 'src/', resultText: '<script src="src/">' },
 			]
 		}, indexHtmlUri);
+		// document: about.html
+		testCompletionFor('<script src="|">', {
+			items: [
+				{ label: 'about.css', resultText: '<script src="about.css">' },
+				{ label: 'about.html', resultText: '<script src="about.html">' },
+				{ label: 'media/', resultText: '<script src="media/">' },
+			]
+		}, aboutHtmlUri);
 	});
-
 	test('Incomplete Path', () => {
 		testCompletionFor('<script src="/src/f|">', {
 			items: [
@@ -192,6 +200,7 @@ suite('HTML Path Completion', () => {
 	});
 
 	test('No leading dot or slash', () => {
+		// document: index.html
 		testCompletionFor('<script src="s|">', {
 			items: [
 				{ label: 'about/', resultText: '<script src="about/">' },
@@ -213,9 +222,31 @@ suite('HTML Path Completion', () => {
 				{ label: 'test.js', resultText: '<script src="src/test.js">' },
 			]
 		}, indexHtmlUri, [fixtureWorkspace]);
+
+		// document: about.html
+		testCompletionFor('<script src="s|">', {
+			items: [
+				{ label: 'about.css', resultText: '<script src="about.css">' },
+				{ label: 'about.html', resultText: '<script src="about.html">' },
+				{ label: 'media/', resultText: '<script src="media/">' },
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
+
+		testCompletionFor('<script src="media/|">', {
+			items: [
+				{ label: 'icon.pic', resultText: '<script src="media/icon.pic">' }
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
+
+		testCompletionFor('<script src="media/f|">', {
+			items: [
+				{ label: 'icon.pic', resultText: '<script src="media/icon.pic">' }
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
 	});
 
 	test('Trigger completion in middle of path', () => {
+		// document: index.html
 		testCompletionFor('<script src="src/f|eature.js">', {
 			items: [
 				{ label: 'feature.js', resultText: '<script src="src/feature.js">' },
@@ -230,8 +261,24 @@ suite('HTML Path Completion', () => {
 				{ label: 'src/', resultText: '<script src="src/">' },
 			]
 		}, indexHtmlUri, [fixtureWorkspace]);
+
+		// document: about.html
+		testCompletionFor('<script src="media/f|eature.js">', {
+			items: [
+				{ label: 'icon.pic', resultText: '<script src="media/icon.pic">' }
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
+
+		testCompletionFor('<script src="m|edia/feature.js">', {
+			items: [
+				{ label: 'about.css', resultText: '<script src="about.css">' },
+				{ label: 'about.html', resultText: '<script src="about.html">' },
+				{ label: 'media/', resultText: '<script src="media/">' },
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
 	});
 
+
 	test('Trigger completion in middle of path and with whitespaces', () => {
 		testCompletionFor('<script src="./| about/about.html>', {
 			items: [
diff --git a/extensions/html-language-features/server/src/test/pathCompletionFixtures/about/media/icon.pic b/extensions/html-language-features/server/src/test/pathCompletionFixtures/about/media/icon.pic
new file mode 100644
index 00000000000..adae63e647c
--- /dev/null
+++ b/extensions/html-language-features/server/src/test/pathCompletionFixtures/about/media/icon.pic
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
\ No newline at end of file

From ed51daf9556cc3a136e6210c7363767e32fb8f09 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 29 Mar 2018 15:27:46 +0200
Subject: [PATCH 206/383] Focus filter text after clicking Select All box
 (fixes #46928)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 99bb1ed715b..c980d5e8c96 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -82,6 +82,11 @@ export class QuickInputService extends Component implements IQuickInputService {
 			const checked = this.checkAll.checked;
 			this.checkboxList.setAllVisibleChecked(checked);
 		}));
+		this.toUnbind.push(dom.addDisposableListener(this.checkAll, dom.EventType.CLICK, e => {
+			if (e.x || e.y) { // Avoid 'click' triggered by 'space'...
+				this.inputBox.setFocus();
+			}
+		}));
 
 		const filterContainer = dom.append(headerContainer, $('.quick-input-filter'));
 

From df7ee603cb897a2edec4e45868321f00a200a020 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 15:28:15 +0200
Subject: [PATCH 207/383] follow up on #46880

---
 .../src/features/quickFixProvider.ts                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/typescript-language-features/src/features/quickFixProvider.ts b/extensions/typescript-language-features/src/features/quickFixProvider.ts
index a85e78e7b6e..088e9734ba8 100644
--- a/extensions/typescript-language-features/src/features/quickFixProvider.ts
+++ b/extensions/typescript-language-features/src/features/quickFixProvider.ts
@@ -110,7 +110,7 @@ class SupportedCodeActionProvider {
 
 	public async getFixableDiagnosticsForContext(context: vscode.CodeActionContext): Promise<vscode.Diagnostic[]> {
 		const supportedActions = await this.supportedCodeActions;
-		const fixableDiagnostics = DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+diagnostic.code)));
+		const fixableDiagnostics = DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+!diagnostic.code)));
 		return Array.from(fixableDiagnostics.values);
 	}
 
@@ -184,7 +184,7 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 	): Promise<Iterable<vscode.CodeAction>> {
 		const args: Proto.CodeFixRequestArgs = {
 			...typeConverters.Range.toFileRangeRequestArgs(file, diagnostic.range),
-			errorCodes: [+diagnostic.code]
+			errorCodes: [+!diagnostic.code]
 		};
 		const codeFixesResponse = await this.client.execute('getCodeFixes', args, token);
 		if (codeFixesResponse.body) {

From acb52f61cda414d63b9251db03faace3155e288b Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 29 Mar 2018 15:32:04 +0200
Subject: [PATCH 208/383] Pointer cursor for button (fixes #46929)

---
 src/vs/workbench/browser/parts/quickinput/quickInput.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 5ed9b89215f..a4d68e602b7 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -47,6 +47,7 @@
 	margin-left: 6px;
 	border: 0;
 	padding: 6px;
+	cursor: pointer;
 }
 
 .quick-input-action:focus {

From c92ff80c96b0d919b6cb5feeaed900e97050e103 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 29 Mar 2018 16:03:58 +0200
Subject: [PATCH 209/383] Pass focus back to filter text (#46926)

---
 .../browser/parts/quickinput/quickInputCheckboxList.ts       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 4d6ce547687..d394f9fa108 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -194,6 +194,11 @@ export class QuickInputCheckboxList {
 					break;
 			}
 		}));
+		this.disposables.push(dom.addDisposableListener(this.container, dom.EventType.CLICK, e => {
+			if (e.x || e.y) { // Avoid 'click' triggered by 'space' on checkbox.
+				this._onLeave.fire();
+			}
+		}));
 	}
 
 	@memoize

From d4af8a95c070d86f65387ef93b3af047f23c3154 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 29 Mar 2018 16:05:39 +0200
Subject: [PATCH 210/383] fix #46938

---
 .../decorations/browser/decorationsService.ts | 10 ++++-
 .../test/browser/decorationsService.test.ts   | 43 +++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 4f55f3044ab..81e0dc727ed 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -245,8 +245,14 @@ class DecorationProviderWrapper {
 
 			} else {
 				// selective changes -> drop for resource, fetch again, send event
+				// perf: the map stores thenables, decorations, or `null`-markers.
+				// we make us of that and ignore all uris in which we have never
+				// been interested.
 				for (const uri of uris) {
-					this._fetchData(uri);
+					const value = this.data.get(uri.toString());
+					if (value !== undefined) {
+						this._fetchData(uri);
+					}
 				}
 			}
 		});
@@ -363,6 +369,8 @@ export class FileDecorationsService implements IDecorationsService {
 
 	dispose(): void {
 		dispose(this._disposables);
+		dispose(this._onDidChangeDecorations);
+		dispose(this._onDidChangeDecorationsDelayed);
 	}
 
 	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable {
diff --git a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
index b8c9e471fab..aae61fb6c20 100644
--- a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
+++ b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import { FileDecorationsService } from 'vs/workbench/services/decorations/browser/decorationsService';
 import { IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
 import URI from 'vs/base/common/uri';
-import { Event, toPromise } from 'vs/base/common/event';
+import { Event, toPromise, Emitter } from 'vs/base/common/event';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 
 suite('DecorationsService', function () {
@@ -75,7 +75,7 @@ suite('DecorationsService', function () {
 		assert.equal(callCounter, 1);
 	});
 
-	test('Clear decorations on provider dispose', function () {
+	test('Clear decorations on provider dispose', async function () {
 		let uri = URI.parse('foo:bar');
 		let callCounter = 0;
 
@@ -94,13 +94,14 @@ suite('DecorationsService', function () {
 
 		// un-register -> ensure good event
 		let didSeeEvent = false;
-		service.onDidChangeDecorations(e => {
+		let p = toPromise(service.onDidChangeDecorations).then(e => {
 			assert.equal(e.affectsResource(uri), true);
 			assert.deepEqual(service.getDecoration(uri, false), undefined);
 			assert.equal(callCounter, 1);
 			didSeeEvent = true;
 		});
 		reg.dispose();
+		await p;
 		assert.equal(didSeeEvent, true);
 	});
 
@@ -168,4 +169,40 @@ suite('DecorationsService', function () {
 
 		reg.dispose();
 	});
+
+	test('Avoid unnecessary decoration change events #46938', async function () {
+
+		let uri1 = URI.parse('file:///uri1.txt');
+		let uri2 = URI.parse('file:///uri2.txt');
+
+		let emitter = new Emitter<URI[]>();
+
+		let asked = new Set<string>();
+
+		let reg = service.registerDecorationsProvider({
+			label: 'Test',
+			onDidChange: emitter.event,
+			provideDecorations(uri: URI) {
+				asked.add(uri.toString());
+				return { tooltip: uri.path, source: 'foo' };
+			}
+		});
+
+		let deco = service.getDecoration(uri1, false);
+		assert.equal(deco.tooltip, '/uri1.txt');
+		assert.equal(asked.size, 1);
+		assert.ok(asked.has(uri1.toString()));
+
+		let didChange = toPromise(service.onDidChangeDecorations);
+		emitter.fire([uri1, uri2]);
+
+		let e = await didChange;
+
+		assert.equal(e.affectsResource(uri1), true);
+		assert.equal(e.affectsResource(uri2), false);
+		assert.equal(asked.size, 1);
+		assert.ok(asked.has(uri1.toString()));
+
+		reg.dispose();
+	});
 });

From 4401b260742fb38da20d074019d708576c0906ac Mon Sep 17 00:00:00 2001
From: Andre Weinand <aweinand@microsoft.com>
Date: Thu, 29 Mar 2018 16:06:29 +0200
Subject: [PATCH 211/383] node-debug@1.22.12

---
 build/builtInExtensions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 4fa344c81a9..2beb7b49935 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.22.11",
+		"version": "1.22.12",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{
@@ -9,4 +9,4 @@
 		"version": "1.22.6",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
-]
\ No newline at end of file
+]

From a0b4c5c77b2ab594db07d9e7f01e3a13898c3164 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 29 Mar 2018 16:34:15 +0200
Subject: [PATCH 212/383] Overwrite inactive focus and selection colors (fixes
 #46924)

---
 .../browser/parts/quickinput/quickInput.ts    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index c980d5e8c96..2ab6fe258fa 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -13,7 +13,7 @@ import { Dimension } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
-import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow, listFocusBackground, listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
 import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -306,4 +306,22 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 		collector.addRule(`.quick-input-action:hover { background-color: ${buttonHoverBackgroundColor}; }`);
 		collector.addRule(`.quick-input-action:focus { background-color: ${buttonHoverBackgroundColor}; }`);
 	}
+
+	// Overwrite inactive focus and selection colors with active ones.
+	const listInactiveFocusBackgroundColor = theme.getColor(listFocusBackground);
+	if (listInactiveFocusBackgroundColor) {
+		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.focused { background-color:  ${listInactiveFocusBackgroundColor}; }`);
+		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.focused:hover { background-color:  ${listInactiveFocusBackgroundColor}; }`); // overwrite :hover style in this case!
+	}
+
+	const listInactiveSelectionBackgroundColor = theme.getColor(listActiveSelectionBackground);
+	if (listInactiveSelectionBackgroundColor) {
+		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.selected { background-color:  ${listInactiveSelectionBackgroundColor}; }`);
+		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.selected:hover { background-color:  ${listInactiveSelectionBackgroundColor}; }`); // overwrite :hover style in this case!
+	}
+
+	const listInactiveSelectionForegroundColor = theme.getColor(listActiveSelectionForeground);
+	if (listInactiveSelectionForegroundColor) {
+		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.selected { color: ${listInactiveSelectionForegroundColor}; }`);
+	}
 });

From cae49fe8a7717579234e8f21d643c5ac6fb49746 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 29 Mar 2018 16:40:40 +0200
Subject: [PATCH 213/383] [folding] provide a setting to disable language
 specific folding strategy. Fixes #46944

---
 .../editor/common/config/commonEditorConfig.ts  | 10 ++++++++++
 src/vs/editor/common/config/editorOptions.ts    | 10 ++++++++++
 src/vs/editor/contrib/folding/folding.ts        | 17 ++++++++++++-----
 src/vs/monaco.d.ts                              |  6 ++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index 2435ca97847..57c4239f480 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -575,6 +575,16 @@ const editorConfiguration: IConfigurationNode = {
 			'default': EDITOR_DEFAULTS.contribInfo.folding,
 			'description': nls.localize('folding', "Controls whether the editor has code folding enabled")
 		},
+		'editor.foldingStrategy': {
+			'type': 'string',
+			'enum': ['auto', 'indentation'],
+			'enumDescriptions': [
+				nls.localize('foldingStrategyAuto', 'If available, use a langauge specific folding strategy, otherwise falls back to the indentation based strategy.'),
+				nls.localize('foldingStrategyIndentation', 'Always use the indentation based folding strategy')
+			],
+			'default': EDITOR_DEFAULTS.contribInfo.foldingStrategy,
+			'description': nls.localize('foldingStrategy', "Controls the way folding ranges are computed. 'auto' picks uses a language specific folding strategy, if available. 'indentation' forces that the indentation based folding strategy is used.")
+		},
 		'editor.showFoldingControls': {
 			'type': 'string',
 			'enum': ['always', 'mouseover'],
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index bfcb5b080f6..2dac3a5df9e 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -500,6 +500,11 @@ export interface IEditorOptions {
 	 * Defaults to true.
 	 */
 	folding?: boolean;
+	/**
+	 * Selects the folding strategy. 'auto' uses the strategies contributed for the current document, 'indentation' uses the indentation based folding strategy.
+	 * Defaults to 'auto'.
+	 */
+	foldingStrategy?: 'auto' | 'indentation';
 	/**
 	 * Controls whether the fold actions in the gutter stay always visible or hide unless the mouse is over the gutter.
 	 * Defaults to 'mouseover'.
@@ -838,6 +843,7 @@ export interface EditorContribOptions {
 	readonly occurrencesHighlight: boolean;
 	readonly codeLens: boolean;
 	readonly folding: boolean;
+	readonly foldingStrategy: 'auto' | 'indentation';
 	readonly showFoldingControls: 'always' | 'mouseover';
 	readonly matchBrackets: boolean;
 	readonly find: InternalEditorFindOptions;
@@ -1188,6 +1194,7 @@ export class InternalEditorOptions {
 			&& a.occurrencesHighlight === b.occurrencesHighlight
 			&& a.codeLens === b.codeLens
 			&& a.folding === b.folding
+			&& a.foldingStrategy === b.foldingStrategy
 			&& a.showFoldingControls === b.showFoldingControls
 			&& a.matchBrackets === b.matchBrackets
 			&& this._equalFindOptions(a.find, b.find)
@@ -1727,6 +1734,7 @@ export class EditorOptionsValidator {
 			occurrencesHighlight: _boolean(opts.occurrencesHighlight, defaults.occurrencesHighlight),
 			codeLens: _boolean(opts.codeLens, defaults.codeLens) && _boolean(opts.referenceInfos, true),
 			folding: _boolean(opts.folding, defaults.folding),
+			foldingStrategy: _stringSet<'auto' | 'indentation'>(opts.foldingStrategy, defaults.foldingStrategy, ['auto', 'indentation']),
 			showFoldingControls: _stringSet<'always' | 'mouseover'>(opts.showFoldingControls, defaults.showFoldingControls, ['always', 'mouseover']),
 			matchBrackets: _boolean(opts.matchBrackets, defaults.matchBrackets),
 			find: find,
@@ -1828,6 +1836,7 @@ export class InternalEditorOptionsFactory {
 				occurrencesHighlight: (accessibilityIsOn ? false : opts.contribInfo.occurrencesHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
 				codeLens: (accessibilityIsOn ? false : opts.contribInfo.codeLens), // DISABLED WHEN SCREEN READER IS ATTACHED
 				folding: (accessibilityIsOn ? false : opts.contribInfo.folding), // DISABLED WHEN SCREEN READER IS ATTACHED
+				foldingStrategy: opts.contribInfo.foldingStrategy,
 				showFoldingControls: opts.contribInfo.showFoldingControls,
 				matchBrackets: (accessibilityIsOn ? false : opts.contribInfo.matchBrackets), // DISABLED WHEN SCREEN READER IS ATTACHED
 				find: opts.contribInfo.find,
@@ -2283,6 +2292,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 		occurrencesHighlight: true,
 		codeLens: true,
 		folding: true,
+		foldingStrategy: 'auto',
 		showFoldingControls: 'mouseover',
 		matchBrackets: true,
 		find: {
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index 56a11c968b4..199089b43bd 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -50,6 +50,7 @@ export class FoldingController implements IEditorContribution {
 	private editor: ICodeEditor;
 	private _isEnabled: boolean;
 	private _autoHideFoldingControls: boolean;
+	private _useFoldingProviders: boolean;
 
 	private foldingDecorationProvider: FoldingDecorationProvider;
 
@@ -72,6 +73,7 @@ export class FoldingController implements IEditorContribution {
 		this.editor = editor;
 		this._isEnabled = this.editor.getConfiguration().contribInfo.folding;
 		this._autoHideFoldingControls = this.editor.getConfiguration().contribInfo.showFoldingControls === 'mouseover';
+		this._useFoldingProviders = this.editor.getConfiguration().contribInfo.foldingStrategy !== 'indentation';
 
 		this.globalToDispose = [];
 		this.localToDispose = [];
@@ -80,7 +82,7 @@ export class FoldingController implements IEditorContribution {
 		this.foldingDecorationProvider.autoHideFoldingControls = this._autoHideFoldingControls;
 
 		this.globalToDispose.push(this.editor.onDidChangeModel(() => this.onModelChanged()));
-		this.globalToDispose.push(FoldingProviderRegistry.onDidChange(() => this.onFoldingProviderRegistryChanged()));
+		this.globalToDispose.push(FoldingProviderRegistry.onDidChange(() => this.onFoldingStrategyChanged()));
 
 		this.globalToDispose.push(this.editor.onDidChangeConfiguration((e: IConfigurationChangedEvent) => {
 			if (e.contribInfo) {
@@ -95,6 +97,11 @@ export class FoldingController implements IEditorContribution {
 					this.foldingDecorationProvider.autoHideFoldingControls = this._autoHideFoldingControls;
 					this.onModelContentChanged();
 				}
+				let oldUseFoldingProviders = this._useFoldingProviders;
+				this._useFoldingProviders = this.editor.getConfiguration().contribInfo.foldingStrategy !== 'indentation';
+				if (oldUseFoldingProviders !== this._useFoldingProviders) {
+					this.onFoldingStrategyChanged();
+				}
 			}
 		}));
 		this.globalToDispose.push({ dispose: () => dispose(this.localToDispose) });
@@ -190,16 +197,16 @@ export class FoldingController implements IEditorContribution {
 		this.onModelContentChanged();
 	}
 
-	private onFoldingProviderRegistryChanged() {
+	private onFoldingStrategyChanged() {
 		this.rangeProvider = null;
 		this.onModelContentChanged();
 	}
 
 	private getRangeProvider(): RangeProvider {
 		if (!this.rangeProvider) {
-			let foldingProviders = FoldingProviderRegistry.ordered(this.foldingModel.textModel);
-			if (foldingProviders.length) {
-				this.rangeProvider = new SyntaxRangeProvider(foldingProviders);
+			if (this._useFoldingProviders) {
+				let foldingProviders = FoldingProviderRegistry.ordered(this.foldingModel.textModel);
+				this.rangeProvider = foldingProviders.length ? new SyntaxRangeProvider(foldingProviders) : new IndentRangeProvider();
 			} else {
 				this.rangeProvider = new IndentRangeProvider();
 			}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 700626d549a..e1e2ccb0a60 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2806,6 +2806,11 @@ declare namespace monaco.editor {
 		 * Defaults to true.
 		 */
 		folding?: boolean;
+		/**
+		 * Selects the folding strategy. 'auto' uses the strategies contributed for the current document, 'indentation' uses the indentation based folding strategy.
+		 * Defaults to 'auto'.
+		 */
+		foldingStrategy?: 'auto' | 'indentation';
 		/**
 		 * Controls whether the fold actions in the gutter stay always visible or hide unless the mouse is over the gutter.
 		 * Defaults to 'mouseover'.
@@ -3085,6 +3090,7 @@ declare namespace monaco.editor {
 		readonly occurrencesHighlight: boolean;
 		readonly codeLens: boolean;
 		readonly folding: boolean;
+		readonly foldingStrategy: 'auto' | 'indentation';
 		readonly showFoldingControls: 'always' | 'mouseover';
 		readonly matchBrackets: boolean;
 		readonly find: InternalEditorFindOptions;

From 21bfdd43b16707a07961f6d2b9d7782e5ea28d27 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Thu, 29 Mar 2018 10:13:21 -0700
Subject: [PATCH 214/383] Remove file paths from telemetry data

---
 .../telemetry/common/telemetryService.ts      | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 6dc744d8d44..bf806cbd0fb 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -37,7 +37,8 @@ export class TelemetryService implements ITelemetryService {
 	private _userOptIn: boolean;
 
 	private _disposables: IDisposable[] = [];
-	private _cleanupPatterns: [RegExp, string][] = [];
+	private _cleanupPatterns: RegExp[] = [];
+	private readonly fileRegex = process.platform === 'win32' ? /[a-z,A-Z]:(\\?[\\\/]\w+)+/g : /(\/\w+)+/g;
 
 	constructor(
 		config: ITelemetryServiceConfig,
@@ -48,18 +49,11 @@ export class TelemetryService implements ITelemetryService {
 		this._piiPaths = config.piiPaths || [];
 		this._userOptIn = typeof config.userOptIn === 'undefined' ? true : config.userOptIn;
 
-		// static cleanup patterns for:
-		// #1 `file:///DANGEROUS/PATH/resources/app/Useful/Information`
-		// #2 // Any other file path that doesn't match the approved form above should be cleaned.
-		// #3 "Error: ENOENT; no such file or directory" is often followed with PII, clean it
-		this._cleanupPatterns.push(
-			[/file:\/\/\/.*?\/resources\/app\//gi, ''],
-			[/file:\/\/\/.*/gi, ''],
-			[/ENOENT: no such file or directory.*?\'([^\']+)\'/gi, 'ENOENT: no such file or directory']
-		);
+		// static cleanup pattern for: `file:///DANGEROUS/PATH/resources/app/Useful/Information`
+		this._cleanupPatterns = [/file:\/\/\/.*?\/resources\/app\//gi];
 
 		for (let piiPath of this._piiPaths) {
-			this._cleanupPatterns.push([new RegExp(escapeRegExpCharacters(piiPath), 'gi'), '']);
+			this._cleanupPatterns.push(new RegExp(escapeRegExpCharacters(piiPath), 'gi'));
 		}
 
 		if (this._configurationService) {
@@ -127,10 +121,21 @@ export class TelemetryService implements ITelemetryService {
 
 	private _cleanupInfo(stack: string): string {
 
+		const m = stack.match(this.fileRegex);
+		if (!m) {
+			return stack;
+		}
+
+		// remove file paths that do not match the cleanup patterns
+		m.forEach(x => {
+			if (this._cleanupPatterns.every(pattern => !pattern.test(x))) {
+				stack = stack.replace(x, '');
+			}
+		});
+
 		// sanitize with configured cleanup patterns
-		for (let tuple of this._cleanupPatterns) {
-			let [regexp, replaceValue] = tuple;
-			stack = stack.replace(regexp, replaceValue);
+		for (let regexp of this._cleanupPatterns) {
+			stack = stack.replace(regexp, '');
 		}
 
 		return stack;

From 0d09b73da112a715449db7ca7939f4630c83bb5c Mon Sep 17 00:00:00 2001
From: svipben <benas.svipas@gmail.com>
Date: Thu, 29 Mar 2018 20:18:44 +0300
Subject: [PATCH 215/383] fixes #45479: different border styles for HC

---
 .../editor/browser/widget/diffEditorWidget.ts | 18 ++++----
 .../editor/common/view/editorColorRegistry.ts | 19 +++++----
 src/vs/editor/contrib/find/findWidget.ts      | 36 ++++++++--------
 .../wordHighlighter/wordHighlighter.ts        | 42 ++++++++-----------
 .../parts/search/browser/searchView.ts        |  6 +--
 5 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index 8bd844fdf8e..294e27a714c 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -2032,27 +2032,31 @@ function createFakeLinesDiv(): HTMLElement {
 }
 
 registerThemingParticipant((theme, collector) => {
-	let added = theme.getColor(diffInserted);
+	const added = theme.getColor(diffInserted);
 	if (added) {
 		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { background-color: ${added}; }`);
 		collector.addRule(`.monaco-diff-editor .line-insert, .monaco-diff-editor .char-insert { background-color: ${added}; }`);
 		collector.addRule(`.monaco-editor .inline-added-margin-view-zone { background-color: ${added}; }`);
 	}
-	let removed = theme.getColor(diffRemoved);
+
+	const removed = theme.getColor(diffRemoved);
 	if (removed) {
 		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { background-color: ${removed}; }`);
 		collector.addRule(`.monaco-diff-editor .line-delete, .monaco-diff-editor .char-delete { background-color: ${removed}; }`);
 		collector.addRule(`.monaco-editor .inline-deleted-margin-view-zone { background-color: ${removed}; }`);
 	}
-	let addedOutline = theme.getColor(diffInsertedOutline);
+
+	const addedOutline = theme.getColor(diffInsertedOutline);
 	if (addedOutline) {
-		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { border: 1px dashed ${addedOutline}; }`);
+		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${addedOutline}; }`);
 	}
-	let removedOutline = theme.getColor(diffRemovedOutline);
+
+	const removedOutline = theme.getColor(diffRemovedOutline);
 	if (removedOutline) {
-		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px dashed ${removedOutline}; }`);
+		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${removedOutline}; }`);
 	}
-	let shadow = theme.getColor(scrollbarShadow);
+
+	const shadow = theme.getColor(scrollbarShadow);
 	if (shadow) {
 		collector.addRule(`.monaco-diff-editor.side-by-side .editor.modified { box-shadow: -6px 0 5px -5px ${shadow}; }`);
 	}
diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts
index 86cfc23d51a..9bafc0f45c2 100644
--- a/src/vs/editor/common/view/editorColorRegistry.ts
+++ b/src/vs/editor/common/view/editorColorRegistry.ts
@@ -56,27 +56,32 @@ export const overviewRulerInfo = registerColor('editorOverviewRuler.infoForegrou
 
 // contains all color rules that used to defined in editor/browser/widget/editor.css
 registerThemingParticipant((theme, collector) => {
-	let background = theme.getColor(editorBackground);
+	const background = theme.getColor(editorBackground);
 	if (background) {
 		collector.addRule(`.monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input { background-color: ${background}; }`);
 	}
-	let foreground = theme.getColor(editorForeground);
+
+	const foreground = theme.getColor(editorForeground);
 	if (foreground) {
 		collector.addRule(`.monaco-editor, .monaco-editor .inputarea.ime-input { color: ${foreground}; }`);
 	}
-	let gutter = theme.getColor(editorGutter);
+
+	const gutter = theme.getColor(editorGutter);
 	if (gutter) {
 		collector.addRule(`.monaco-editor .margin { background-color: ${gutter}; }`);
 	}
-	let rangeHighlight = theme.getColor(editorRangeHighlight);
+
+	const rangeHighlight = theme.getColor(editorRangeHighlight);
 	if (rangeHighlight) {
 		collector.addRule(`.monaco-editor .rangeHighlight { background-color: ${rangeHighlight}; }`);
 	}
-	let rangeHighlightBorder = theme.getColor(editorRangeHighlightBorder);
+
+	const rangeHighlightBorder = theme.getColor(editorRangeHighlightBorder);
 	if (rangeHighlightBorder) {
-		collector.addRule(`.monaco-editor .rangeHighlight { border: 1px dotted ${rangeHighlightBorder}; }`);
+		collector.addRule(`.monaco-editor .rangeHighlight { border: 1px ${theme.type === 'hc' ? 'dotted' : 'solid'} ${rangeHighlightBorder}; }`);
 	}
-	let invisibles = theme.getColor(editorWhitespaces);
+
+	const invisibles = theme.getColor(editorWhitespaces);
 	if (invisibles) {
 		collector.addRule(`.vs-whitespace { color: ${invisibles} !important; }`);
 	}
diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts
index a852de93cbc..83ff2daa50a 100644
--- a/src/vs/editor/contrib/find/findWidget.ts
+++ b/src/vs/editor/contrib/find/findWidget.ts
@@ -1066,48 +1066,50 @@ export class SimpleButton extends Widget {
 // theming
 
 registerThemingParticipant((theme, collector) => {
-	function addBackgroundColorRule(selector: string, color: Color): void {
+	const addBackgroundColorRule = (selector: string, color: Color): void => {
 		if (color) {
 			collector.addRule(`.monaco-editor ${selector} { background-color: ${color}; }`);
 		}
-	}
+	};
 
 	addBackgroundColorRule('.findMatch', theme.getColor(editorFindMatchHighlight));
 	addBackgroundColorRule('.currentFindMatch', theme.getColor(editorFindMatch));
 	addBackgroundColorRule('.findScope', theme.getColor(editorFindRangeHighlight));
 
-	let widgetBackground = theme.getColor(editorWidgetBackground);
+	const widgetBackground = theme.getColor(editorWidgetBackground);
 	addBackgroundColorRule('.find-widget', widgetBackground);
 
-	let widgetShadowColor = theme.getColor(widgetShadow);
+	const widgetShadowColor = theme.getColor(widgetShadow);
 	if (widgetShadowColor) {
 		collector.addRule(`.monaco-editor .find-widget { box-shadow: 0 2px 8px ${widgetShadowColor}; }`);
 	}
 
-	let findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
+	const findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
 	if (findMatchHighlightBorder) {
-		collector.addRule(`.monaco-editor .findMatch { border: 1px dotted ${findMatchHighlightBorder}; -moz-box-sizing: border-box; box-sizing: border-box; }`);
-	}
-	let findMatchBorder = theme.getColor(editorFindMatchBorder);
-	if (findMatchBorder) {
-		collector.addRule(`.monaco-editor .currentFindMatch { border: 2px solid ${findMatchBorder}; padding: 1px; -moz-box-sizing: border-box; box-sizing: border-box; }`);
-	}
-	let findRangeHighlightBorder = theme.getColor(editorFindRangeHighlightBorder);
-	if (findRangeHighlightBorder) {
-		collector.addRule(`.monaco-editor .findScope { border: 1px dashed ${findRangeHighlightBorder}; }`);
+		collector.addRule(`.monaco-editor .findMatch { border: 1px ${theme.type === 'hc' ? 'dotted' : 'solid'} ${findMatchHighlightBorder}; box-sizing: border-box; }`);
 	}
 
-	let hcBorder = theme.getColor(contrastBorder);
+	const findMatchBorder = theme.getColor(editorFindMatchBorder);
+	if (findMatchBorder) {
+		collector.addRule(`.monaco-editor .currentFindMatch { border: 2px solid ${findMatchBorder}; padding: 1px; box-sizing: border-box; }`);
+	}
+
+	const findRangeHighlightBorder = theme.getColor(editorFindRangeHighlightBorder);
+	if (findRangeHighlightBorder) {
+		collector.addRule(`.monaco-editor .findScope { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${findRangeHighlightBorder}; }`);
+	}
+
+	const hcBorder = theme.getColor(contrastBorder);
 	if (hcBorder) {
 		collector.addRule(`.monaco-editor .find-widget { border: 2px solid ${hcBorder}; }`);
 	}
 
-	let error = theme.getColor(errorForeground);
+	const error = theme.getColor(errorForeground);
 	if (error) {
 		collector.addRule(`.monaco-editor .find-widget.no-results .matchesCount { color: ${error}; }`);
 	}
 
-	let border = theme.getColor(editorWidgetBorder);
+	const border = theme.getColor(editorWidgetBorder);
 	if (border) {
 		collector.addRule(`.monaco-editor .find-widget .monaco-sash { background-color: ${border}; width: 3px !important; margin-left: -4px;}`);
 	}
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
index 00c39b26a49..dd664d73fb7 100644
--- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -504,42 +504,34 @@ registerEditorAction(NextWordHighlightAction);
 registerEditorAction(PrevWordHighlightAction);
 
 registerThemingParticipant((theme, collector) => {
-	let selectionHighlight = theme.getColor(editorSelectionHighlight);
+	const selectionHighlight = theme.getColor(editorSelectionHighlight);
 	if (selectionHighlight) {
 		collector.addRule(`.monaco-editor .focused .selectionHighlight { background-color: ${selectionHighlight}; }`);
 		collector.addRule(`.monaco-editor .selectionHighlight { background-color: ${selectionHighlight.transparent(0.5)}; }`);
 	}
-	let wordHighlight = theme.getColor(editorWordHighlight);
+
+	const wordHighlight = theme.getColor(editorWordHighlight);
 	if (wordHighlight) {
 		collector.addRule(`.monaco-editor .wordHighlight { background-color: ${wordHighlight}; }`);
 	}
-	let wordHighlightStrong = theme.getColor(editorWordHighlightStrong);
+
+	const wordHighlightStrong = theme.getColor(editorWordHighlightStrong);
 	if (wordHighlightStrong) {
 		collector.addRule(`.monaco-editor .wordHighlightStrong { background-color: ${wordHighlightStrong}; }`);
 	}
-	let selectionHighlightBorder = theme.getColor(editorSelectionHighlightBorder);
+
+	const selectionHighlightBorder = theme.getColor(editorSelectionHighlightBorder);
 	if (selectionHighlightBorder) {
-		if (theme.type === 'hc') {
-			collector.addRule(`.monaco-editor .selectionHighlight { border: 1px dotted ${selectionHighlightBorder}; box-sizing: border-box; }`);
-		} else {
-			collector.addRule(`.monaco-editor .selectionHighlight { border: 1px solid ${selectionHighlightBorder}; box-sizing: border-box; }`);
-		}
-	}
-	let wordHighlightBorder = theme.getColor(editorWordHighlightBorder);
-	if (wordHighlightBorder) {
-		if (theme.type === 'hc') {
-			collector.addRule(`.monaco-editor .wordHighlight { border: 1px dashed ${wordHighlightBorder}; box-sizing: border-box; }`);
-		} else {
-			collector.addRule(`.monaco-editor .wordHighlight { border: 1px solid ${wordHighlightBorder}; box-sizing: border-box; }`);
-		}
-	}
-	let wordHighlightStrongBorder = theme.getColor(editorWordHighlightStrongBorder);
-	if (wordHighlightStrongBorder) {
-		if (theme.type === 'hc') {
-			collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px dashed ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
-		} else {
-			collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px solid ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
-		}
+		collector.addRule(`.monaco-editor .selectionHighlight { border: 1px ${theme.type === 'hc' ? 'dotted' : 'solid'} ${selectionHighlightBorder}; box-sizing: border-box; }`);
 	}
 
+	const wordHighlightBorder = theme.getColor(editorWordHighlightBorder);
+	if (wordHighlightBorder) {
+		collector.addRule(`.monaco-editor .wordHighlight { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${wordHighlightBorder}; box-sizing: border-box; }`);
+	}
+
+	const wordHighlightStrongBorder = theme.getColor(editorWordHighlightStrongBorder);
+	if (wordHighlightStrongBorder) {
+		collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
+	}
 });
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index d40610f8601..ff5008ac4c9 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -1489,16 +1489,16 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	const diffInsertedOutlineColor = theme.getColor(diffInsertedOutline);
 	if (diffInsertedOutlineColor) {
-		collector.addRule(`.monaco-workbench .search-view .replaceMatch:not(:empty) { border: 1px dashed ${diffInsertedOutlineColor}; }`);
+		collector.addRule(`.monaco-workbench .search-view .replaceMatch:not(:empty) { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${diffInsertedOutlineColor}; }`);
 	}
 
 	const diffRemovedOutlineColor = theme.getColor(diffRemovedOutline);
 	if (diffRemovedOutlineColor) {
-		collector.addRule(`.monaco-workbench .search-view .replace.findInFileMatch { border: 1px dashed ${diffRemovedOutlineColor}; }`);
+		collector.addRule(`.monaco-workbench .search-view .replace.findInFileMatch { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${diffRemovedOutlineColor}; }`);
 	}
 
 	const findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
 	if (findMatchHighlightBorder) {
-		collector.addRule(`.monaco-workbench .search-view .findInFileMatch { border: 1px dashed ${findMatchHighlightBorder}; }`);
+		collector.addRule(`.monaco-workbench .search-view .findInFileMatch { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${findMatchHighlightBorder}; }`);
 	}
 });

From 2e379b2d6341ef038af44d3c935736e8dbb59124 Mon Sep 17 00:00:00 2001
From: SteVen Batten <6561887+sbatten@users.noreply.github.com>
Date: Thu, 29 Mar 2018 11:01:42 -0700
Subject: [PATCH 216/383] reset cwd right before relaunch (#46876)

* reset cwd right before relaunch
---
 .../lifecycle/electron-main/lifecycleMain.ts      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
index 5cc5c24c996..a2388d8fa49 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
@@ -14,7 +14,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
 import { ReadyState } from 'vs/platform/windows/common/windows';
 import { handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
+import { isMacintosh, isWindows } from 'vs/base/common/platform';
 
 export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
 
@@ -389,6 +389,19 @@ export class LifecycleService implements ILifecycleService {
 		app.once('quit', () => {
 			if (!vetoed) {
 				this.stateService.setItem(LifecycleService.QUIT_FROM_RESTART_MARKER, true);
+
+				// Windows: we are about to restart and as such we need to restore the original
+				// current working directory we had on startup to get the exact same startup
+				// behaviour. As such, we briefly change back to the VSCODE_CWD and then when
+				// Code starts it will set it back to the installation directory again.
+				try {
+					if (isWindows) {
+						process.chdir(process.env['VSCODE_CWD']);
+					}
+				} catch (err) {
+					this.logService.error(err);
+				}
+
 				app.relaunch({ args });
 			}
 		});

From 7f3f77b526071075280881ac720cf82ddb738ed2 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 29 Mar 2018 11:25:54 -0700
Subject: [PATCH 217/383] Move terminal ipc handling to service to fix unit
 test debugging

---
 .../terminal/electron-browser/terminalPanel.ts    | 12 ------------
 .../terminal/electron-browser/terminalService.ts  | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index 21926d694f0..5667a99df12 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -28,9 +28,6 @@ import { PANEL_BACKGROUND, PANEL_BORDER } from 'vs/workbench/common/theme';
 import { TERMINAL_BACKGROUND_COLOR, TERMINAL_BORDER_COLOR } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { ipcRenderer as ipc } from 'electron';
-import { IOpenFileRequest } from 'vs/platform/windows/common/windows';
-import { whenDeleted } from 'vs/base/node/pfs';
 
 export class TerminalPanel extends Panel {
 
@@ -86,15 +83,6 @@ export class TerminalPanel extends Panel {
 		this._updateFont();
 		this._updateTheme();
 
-		ipc.on('vscode:openFiles', (_event: any, request: IOpenFileRequest) => {
-			// if the request to open files is coming in from the integrated terminal (identified though
-			// the termProgram variable) and we are instructed to wait for editors close, wait for the
-			// marker file to get deleted and then focus back to the integrated terminal.
-			if (request.termProgram === 'vscode' && request.filesToWait) {
-				whenDeleted(request.filesToWait.waitMarkerFilePath).then(() => this.focus());
-			}
-		});
-
 		// Force another layout (first is setContainers) since config has changed
 		this.layout(new Dimension(this._terminalContainer.offsetWidth, this._terminalContainer.offsetHeight));
 		return TPromise.as(void 0);
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index 54e34c38cb4..95f9e18ddf5 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -24,6 +24,8 @@ import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/term
 import { TerminalTab } from 'vs/workbench/parts/terminal/electron-browser/terminalTab';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { ipcRenderer as ipc } from 'electron';
+import { IOpenFileRequest } from 'vs/platform/windows/common/windows';
 
 export class TerminalService extends AbstractTerminalService implements ITerminalService {
 	private _configHelper: TerminalConfigHelper;
@@ -50,6 +52,19 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 
 		this._terminalTabs = [];
 		this._configHelper = this._instantiationService.createInstance(TerminalConfigHelper);
+
+		ipc.on('vscode:openFiles', (_event: any, request: IOpenFileRequest) => {
+			// if the request to open files is coming in from the integrated terminal (identified though
+			// the termProgram variable) and we are instructed to wait for editors close, wait for the
+			// marker file to get deleted and then focus back to the integrated terminal.
+			if (request.termProgram === 'vscode' && request.filesToWait) {
+				pfs.whenDeleted(request.filesToWait.waitMarkerFilePath).then(() => {
+					if (this.terminalInstances.length > 0) {
+						this.getActiveInstance().focus();
+					}
+				});
+			}
+		});
 	}
 
 	public createInstance(shell: IShellLaunchConfig = {}, wasNewTerminalAction?: boolean): ITerminalInstance {

From b7721220b0ad94daaa39f726402999b286d5cdf7 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Thu, 29 Mar 2018 11:41:02 -0700
Subject: [PATCH 218/383] Revert "Remove file paths from telemetry data"

This reverts commit 21bfdd43b16707a07961f6d2b9d7782e5ea28d27.
---
 .../telemetry/common/telemetryService.ts      | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index bf806cbd0fb..6dc744d8d44 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -37,8 +37,7 @@ export class TelemetryService implements ITelemetryService {
 	private _userOptIn: boolean;
 
 	private _disposables: IDisposable[] = [];
-	private _cleanupPatterns: RegExp[] = [];
-	private readonly fileRegex = process.platform === 'win32' ? /[a-z,A-Z]:(\\?[\\\/]\w+)+/g : /(\/\w+)+/g;
+	private _cleanupPatterns: [RegExp, string][] = [];
 
 	constructor(
 		config: ITelemetryServiceConfig,
@@ -49,11 +48,18 @@ export class TelemetryService implements ITelemetryService {
 		this._piiPaths = config.piiPaths || [];
 		this._userOptIn = typeof config.userOptIn === 'undefined' ? true : config.userOptIn;
 
-		// static cleanup pattern for: `file:///DANGEROUS/PATH/resources/app/Useful/Information`
-		this._cleanupPatterns = [/file:\/\/\/.*?\/resources\/app\//gi];
+		// static cleanup patterns for:
+		// #1 `file:///DANGEROUS/PATH/resources/app/Useful/Information`
+		// #2 // Any other file path that doesn't match the approved form above should be cleaned.
+		// #3 "Error: ENOENT; no such file or directory" is often followed with PII, clean it
+		this._cleanupPatterns.push(
+			[/file:\/\/\/.*?\/resources\/app\//gi, ''],
+			[/file:\/\/\/.*/gi, ''],
+			[/ENOENT: no such file or directory.*?\'([^\']+)\'/gi, 'ENOENT: no such file or directory']
+		);
 
 		for (let piiPath of this._piiPaths) {
-			this._cleanupPatterns.push(new RegExp(escapeRegExpCharacters(piiPath), 'gi'));
+			this._cleanupPatterns.push([new RegExp(escapeRegExpCharacters(piiPath), 'gi'), '']);
 		}
 
 		if (this._configurationService) {
@@ -121,21 +127,10 @@ export class TelemetryService implements ITelemetryService {
 
 	private _cleanupInfo(stack: string): string {
 
-		const m = stack.match(this.fileRegex);
-		if (!m) {
-			return stack;
-		}
-
-		// remove file paths that do not match the cleanup patterns
-		m.forEach(x => {
-			if (this._cleanupPatterns.every(pattern => !pattern.test(x))) {
-				stack = stack.replace(x, '');
-			}
-		});
-
 		// sanitize with configured cleanup patterns
-		for (let regexp of this._cleanupPatterns) {
-			stack = stack.replace(regexp, '');
+		for (let tuple of this._cleanupPatterns) {
+			let [regexp, replaceValue] = tuple;
+			stack = stack.replace(regexp, replaceValue);
 		}
 
 		return stack;

From 603a580dc6a3bc70780302c0ee1dbea615099e1a Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 29 Mar 2018 21:42:36 +0200
Subject: [PATCH 219/383] Revert "Overwrite inactive focus and selection colors
 (fixes #46924)"

This reverts commit a0b4c5c77b2ab594db07d9e7f01e3a13898c3164.
---
 .../browser/parts/quickinput/quickInput.ts    | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 2ab6fe258fa..c980d5e8c96 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -13,7 +13,7 @@ import { Dimension } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
-import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow, listFocusBackground, listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
+import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
 import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -306,22 +306,4 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 		collector.addRule(`.quick-input-action:hover { background-color: ${buttonHoverBackgroundColor}; }`);
 		collector.addRule(`.quick-input-action:focus { background-color: ${buttonHoverBackgroundColor}; }`);
 	}
-
-	// Overwrite inactive focus and selection colors with active ones.
-	const listInactiveFocusBackgroundColor = theme.getColor(listFocusBackground);
-	if (listInactiveFocusBackgroundColor) {
-		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.focused { background-color:  ${listInactiveFocusBackgroundColor}; }`);
-		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.focused:hover { background-color:  ${listInactiveFocusBackgroundColor}; }`); // overwrite :hover style in this case!
-	}
-
-	const listInactiveSelectionBackgroundColor = theme.getColor(listActiveSelectionBackground);
-	if (listInactiveSelectionBackgroundColor) {
-		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.selected { background-color:  ${listInactiveSelectionBackgroundColor}; }`);
-		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.selected:hover { background-color:  ${listInactiveSelectionBackgroundColor}; }`); // overwrite :hover style in this case!
-	}
-
-	const listInactiveSelectionForegroundColor = theme.getColor(listActiveSelectionForeground);
-	if (listInactiveSelectionForegroundColor) {
-		collector.addRule(`.quick-input-widget .monaco-list .monaco-list-row.selected { color: ${listInactiveSelectionForegroundColor}; }`);
-	}
 });

From 77f268b447f2f6cab9617da579c13439df6db346 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 29 Mar 2018 17:15:11 -0700
Subject: [PATCH 220/383] Bump node-debug for #46782

---
 build/builtInExtensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 2beb7b49935..ccd151d7d3d 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.22.12",
+		"version": "1.22.13",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{

From e252da38617bdacc9612873528d6477b64232d50 Mon Sep 17 00:00:00 2001
From: Gus Hurovich <gushurovich@gmail.com>
Date: Thu, 29 Mar 2018 17:48:32 -0700
Subject: [PATCH 221/383] Adding tests for stylesheets partial parsing (#46977)

---
 .../src/test/partialParsingStylesheet.test.ts | 255 ++++++++++++++++++
 1 file changed, 255 insertions(+)
 create mode 100644 extensions/emmet/src/test/partialParsingStylesheet.test.ts

diff --git a/extensions/emmet/src/test/partialParsingStylesheet.test.ts b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
new file mode 100644
index 00000000000..6c3b995960f
--- /dev/null
+++ b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
@@ -0,0 +1,255 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'mocha';
+import * as assert from 'assert';
+import { withRandomFileEditor } from './testUtils';
+import * as vscode from 'vscode';
+import { parsePartialStylesheet } from '../util';
+import { isValidLocationForEmmetAbbreviation } from '../abbreviationActions';
+
+
+
+suite('Tests for partial parse of Stylesheets', () => {
+	test('Ignore block comment inside rule', function (): any {
+		const cssContents = `
+p {
+	margin: p ;
+	/*dn: none; p */ p
+	p
+	p.
+} p
+`;
+		return withRandomFileEditor(cssContents, '.css', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(3, 18, 3, 19),		// Same line after block comment
+				new vscode.Range(4, 1, 4, 2),		// p after block comment
+				new vscode.Range(5, 1, 5, 3)		// p. after block comment
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 0, 1, 1),		// Selector
+				new vscode.Range(2, 9, 2, 10),		// Property value
+				new vscode.Range(3, 3, 3, 5),		// dn inside block comment
+				new vscode.Range(3, 13, 3, 14),		// p just before ending of block comment
+				new vscode.Range(6, 2, 6, 3)		// p after ending of block
+
+			]
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), false);
+			});
+
+			return Promise.resolve();
+		});
+	});
+
+	test('Ignore commented braces', function (): any {
+		const sassContents = `
+.foo
+// .foo { brs
+/* .foo { op.3 
+dn	{
+*/
+	@
+} bg
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesNotEmmet = [
+				new vscode.Range(1, 0, 1, 4),		// Selector
+				new vscode.Range(2, 3, 2, 7),		// Line commented selector
+				new vscode.Range(3, 3, 3, 7),		// Block commented selector
+				new vscode.Range(4, 0, 4, 2),		// dn inside block comment
+				new vscode.Range(6, 1, 6, 2),		// @ inside a rule whose opening brace is commented
+				new vscode.Range(7, 2, 7, 4)		// bg after ending of badly constructed block
+			];
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Block comment between selector and open brace', function (): any {
+		const cssContents = `
+p   
+/* First line
+of a multiline
+comment */
+{
+	margin: p ;
+	/*dn: none; p */ p
+	p
+	p.
+} p
+`;
+		return withRandomFileEditor(cssContents, '.css', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(7, 18, 7, 19),		// Same line after block comment
+				new vscode.Range(8, 1, 8, 2),		// p after block comment
+				new vscode.Range(9, 1, 9, 3)		// p. after block comment
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 2, 1, 3),		// Selector
+				new vscode.Range(3, 3, 3, 4),		// Inside multiline comment
+				new vscode.Range(5, 0, 5, 1),		// Opening Brace
+				new vscode.Range(6, 9, 6, 10),		// Property value
+				new vscode.Range(7, 3, 7, 5),		// dn inside block comment
+				new vscode.Range(7, 13, 7, 14),		// p just before ending of block comment
+				new vscode.Range(10, 2, 10, 3)		// p after ending of block
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Nested and consecutive rulesets with errors', function (): any {
+		const sassContents = `
+.foo{
+	a
+	a
+}}{ p
+}
+.bar{
+	@
+	.rudi {
+		@
+	}
+}}}
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(2, 1, 2, 2),		// Inside a ruleset before errors
+				new vscode.Range(3, 1, 3, 2),		// Inside a ruleset after no serious error
+				new vscode.Range(7, 1, 7, 2),		// @ inside a so far well structured ruleset
+				new vscode.Range(9, 2, 9, 3),		// @ inside a so far well structured nested ruleset
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(4, 4, 4, 5),		// p inside ruleset without proper selector
+				new vscode.Range(6, 3, 6, 4)		// In selector
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('One liner sass', function (): any {
+		const sassContents = `
+.foo{dn}.bar{.boo{dn}dn}.comd{/*{dn*/p{div{dn}} }.foo{.other{dn}} dn
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(1, 5, 1, 7),		// Inside a ruleset
+				new vscode.Range(1, 18, 1, 20),		// Inside a nested ruleset
+				new vscode.Range(1, 21, 1, 23),		// Inside ruleset after nested one.
+				new vscode.Range(1, 43, 1, 45),		// Inside nested ruleset after comment
+				new vscode.Range(1, 61, 1, 63)		// Inside nested ruleset
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 3, 1, 4),		// In foo selector
+				new vscode.Range(1, 10, 1, 11),		// In bar selector
+				new vscode.Range(1, 15, 1, 16),		// In boo selector
+				new vscode.Range(1, 28, 1, 29),		// In comd selector
+				new vscode.Range(1, 33, 1, 34),		// In commented dn
+				new vscode.Range(1, 37, 1, 38),		// In p selector
+				new vscode.Range(1, 39, 1, 42),		// In div selector
+				new vscode.Range(1, 66, 1, 68)		// Outside any ruleset
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Variables and interpolation', function (): any {
+		const sassContents = `
+p.#{dn} {
+	p.3
+	#{$attr}-color: blue;
+	dn
+} op
+.foo{nes{ted}} {
+	dn
+}
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(2, 1, 2, 4),		// p.3 inside a ruleset whose selector uses interpolation
+				new vscode.Range(3, 1, 3, 2),		// # inside ruleset
+				new vscode.Range(4, 1, 4, 3)		// dn inside ruleset after property with variable
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 0, 1, 1),		// In p in selector
+				new vscode.Range(1, 2, 1, 3),		// In # in selector
+				new vscode.Range(1, 4, 1, 6),		// In dn inside variable in selector
+				new vscode.Range(3, 7, 3, 8),		// r of attr inside variable
+				new vscode.Range(5, 2, 5, 4),		// op after ruleset
+				new vscode.Range(7, 1, 7, 3)		// dn inside ruleset whose selector uses nested interpolation
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Comments in sass', function (): any {
+		const sassContents = `
+.foo{
+	/* p // p */ brs6-2p
+	dn
+}
+p
+/* c
+om
+ment */{
+	m10
+}
+.boo{ 
+	op.3
+}
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(2, 14, 2, 21),		// brs6-2p with a block commented line comment ('/* */' overrides '//')
+				new vscode.Range(3, 1, 3, 3),		// dn after a line with combined comments inside a ruleset
+				new vscode.Range(9, 1, 9, 4),		// m10 inside ruleset whose selector is before a comment
+				new vscode.Range(12, 1, 12, 5)		// op3 inside a ruleset with commented extra braces
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(2, 4, 2, 5),		// In p inside block comment
+				new vscode.Range(2, 9, 2, 10),		// In p inside block comment and after line comment
+				new vscode.Range(6, 3, 6, 4)		// In c inside block comment
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	
+});
\ No newline at end of file

From d7923f49fa4fee04037ee3df40797e82dcea69bc Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Thu, 29 Mar 2018 18:04:35 -0700
Subject: [PATCH 222/383] Anonymize file paths before sending telemetry

---
 .../telemetry/common/telemetryService.ts      | 48 +++++++++-----
 .../electron-browser/telemetryService.test.ts | 64 +++++++++++++------
 2 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 6dc744d8d44..2f713dd11af 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -37,7 +37,7 @@ export class TelemetryService implements ITelemetryService {
 	private _userOptIn: boolean;
 
 	private _disposables: IDisposable[] = [];
-	private _cleanupPatterns: [RegExp, string][] = [];
+	private _cleanupPatterns: RegExp[] = [];
 
 	constructor(
 		config: ITelemetryServiceConfig,
@@ -48,18 +48,11 @@ export class TelemetryService implements ITelemetryService {
 		this._piiPaths = config.piiPaths || [];
 		this._userOptIn = typeof config.userOptIn === 'undefined' ? true : config.userOptIn;
 
-		// static cleanup patterns for:
-		// #1 `file:///DANGEROUS/PATH/resources/app/Useful/Information`
-		// #2 // Any other file path that doesn't match the approved form above should be cleaned.
-		// #3 "Error: ENOENT; no such file or directory" is often followed with PII, clean it
-		this._cleanupPatterns.push(
-			[/file:\/\/\/.*?\/resources\/app\//gi, ''],
-			[/file:\/\/\/.*/gi, ''],
-			[/ENOENT: no such file or directory.*?\'([^\']+)\'/gi, 'ENOENT: no such file or directory']
-		);
+		// static cleanup pattern for: `file:///DANGEROUS/PATH/resources/app/Useful/Information`
+		this._cleanupPatterns = [/file:\/\/\/.*?\/resources\/app\//gi];
 
 		for (let piiPath of this._piiPaths) {
-			this._cleanupPatterns.push([new RegExp(escapeRegExpCharacters(piiPath), 'gi'), '']);
+			this._cleanupPatterns.push(new RegExp(escapeRegExpCharacters(piiPath), 'gi'));
 		}
 
 		if (this._configurationService) {
@@ -126,14 +119,35 @@ export class TelemetryService implements ITelemetryService {
 	}
 
 	private _cleanupInfo(stack: string): string {
-
-		// sanitize with configured cleanup patterns
-		for (let tuple of this._cleanupPatterns) {
-			let [regexp, replaceValue] = tuple;
-			stack = stack.replace(regexp, replaceValue);
+		const cleanUpIndexes: [number, number][] = [];
+		for (let regexp of this._cleanupPatterns) {
+			while (true) {
+				const result = regexp.exec(stack);
+				if (!result) {
+					break;
+				}
+				cleanUpIndexes.push([result.index, regexp.lastIndex]);
+			}
 		}
 
-		return stack;
+		const fileRegex = /(file:\/\/)?([a-z,A-Z]:)?([\\\/]\w+)+/g;
+		let updatedStack = stack;
+		while (true) {
+			const result = fileRegex.exec(stack);
+			if (!result) {
+				break;
+			}
+			// Anoynimize user file paths that do not need cleanup.
+			if (cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
+				updatedStack = updatedStack.slice(0, result.index) + result[0].replace(/./g, 'a') + updatedStack.slice(fileRegex.lastIndex);
+			}
+		}
+
+		// sanitize with configured cleanup patterns
+		for (let regexp of this._cleanupPatterns) {
+			updatedStack = updatedStack.replace(regexp, '');
+		}
+		return updatedStack;
 	}
 }
 
diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
index b29b0fff824..d3062bc7ff2 100644
--- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -50,6 +50,8 @@ class ErrorTestingSettings {
 	public noSuchFilePrefix: string;
 	public noSuchFileMessage: string;
 	public stack: string[];
+	public randomUserFile: string = 'a/path/that/doesnt/contain/code/names';
+	public anonymizedRandomUserFile: string = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
 
 	constructor() {
 		this.personalInfo = 'DANGEROUS/PATH';
@@ -64,20 +66,20 @@ class ErrorTestingSettings {
 		this.noSuchFilePrefix = 'ENOENT: no such file or directory';
 		this.noSuchFileMessage = this.noSuchFilePrefix + ' \'' + this.personalInfo + '\'';
 
-		this.stack = ['at e._modelEvents (a/path/that/doesnt/contain/code/names.js:11:7309)',
-			'    at t.AllWorkers (a/path/that/doesnt/contain/code/names.js:6:8844)',
-			'    at e.(anonymous function) [as _modelEvents] (a/path/that/doesnt/contain/code/names.js:5:29552)',
-			'    at Function.<anonymous> (a/path/that/doesnt/contain/code/names.js:6:8272)',
-			'    at e.dispatch (a/path/that/doesnt/contain/code/names.js:5:26931)',
-			'    at e.request (a/path/that/doesnt/contain/code/names.js:14:1745)',
+		this.stack = [`at e._modelEvents (${this.randomUserFile}.js:11:7309)`,
+		`    at t.AllWorkers (${this.randomUserFile}.js:6:8844)`,
+		`    at e.(anonymous function) [as _modelEvents] (${this.randomUserFile}.js:5:29552)`,
+		`    at Function.<anonymous> (${this.randomUserFile}.js:6:8272)`,
+		`    at e.dispatch (${this.randomUserFile}.js:5:26931)`,
+		`    at e.request (${this.randomUserFile}.js:14:1745)`,
 			'    at t._handleMessage (another/path/that/doesnt/contain/code/names.js:14:17447)',
 			'    at t._onmessage (another/path/that/doesnt/contain/code/names.js:14:16976)',
 			'    at t.onmessage (another/path/that/doesnt/contain/code/names.js:14:15854)',
 			'    at DedicatedWorkerGlobalScope.self.onmessage',
-			this.dangerousPathWithImportantInfo,
-			this.dangerousPathWithoutImportantInfo,
-			this.missingModelMessage,
-			this.noSuchFileMessage];
+		this.dangerousPathWithImportantInfo,
+		this.dangerousPathWithoutImportantInfo,
+		this.missingModelMessage,
+		this.noSuchFileMessage];
 	}
 }
 
@@ -289,6 +291,28 @@ suite('TelemetryService', () => {
 		service.dispose();
 	}));
 
+	test('Error Telemetry removes PII from filename with spaces', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
+		window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
+
+		let personInfoWithSpaces = settings.personalInfo.slice(0, 2) + ' ' + settings.personalInfo.slice(2);
+		let dangerousFilenameError: any = new Error('dangerousFilename');
+		dangerousFilenameError.stack = settings.stack;
+		(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces) + '/test.js', 2, 42, dangerousFilenameError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+		assert.equal(errorStub.callCount, 1);
+		assert.equal(testAppender.events[0].data.filename.indexOf(settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces)), -1);
+		assert.equal(testAppender.events[0].data.filename, settings.importantInfo + '/test.js');
+
+		errorTelemetry.dispose();
+		service.dispose();
+	}));
+
 	test('Uncaught Error Telemetry removes PII from filename', sinon.test(function (this: any) {
 		let errorStub = sinon.stub();
 		window.onerror = errorStub;
@@ -337,7 +361,7 @@ suite('TelemetryService', () => {
 
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
@@ -367,7 +391,7 @@ suite('TelemetryService', () => {
 		assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
@@ -398,7 +422,7 @@ suite('TelemetryService', () => {
 			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
@@ -430,7 +454,7 @@ suite('TelemetryService', () => {
 		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
@@ -461,7 +485,7 @@ suite('TelemetryService', () => {
 			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
@@ -493,7 +517,7 @@ suite('TelemetryService', () => {
 		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
@@ -525,7 +549,7 @@ suite('TelemetryService', () => {
 			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.missingModelPrefix), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
@@ -557,7 +581,7 @@ suite('TelemetryService', () => {
 		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.missingModelPrefix), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
@@ -589,7 +613,7 @@ suite('TelemetryService', () => {
 			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.noSuchFilePrefix), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
@@ -626,7 +650,7 @@ suite('TelemetryService', () => {
 			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.noSuchFilePrefix), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
 			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
 			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();

From 7409e4e6078c82c1a01af746899fd7743bdf5b49 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 29 Mar 2018 19:14:55 -0700
Subject: [PATCH 223/383] Fix search smoketest for merged include/exclude boxes

---
 test/smoke/src/areas/search/search.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/smoke/src/areas/search/search.ts b/test/smoke/src/areas/search/search.ts
index f2d98866b02..5418cad3c21 100644
--- a/test/smoke/src/areas/search/search.ts
+++ b/test/smoke/src/areas/search/search.ts
@@ -8,7 +8,7 @@ import { Viewlet } from '../workbench/viewlet';
 
 const VIEWLET = 'div[id="workbench.view.search"] .search-view';
 const INPUT = `${VIEWLET} .search-widget .search-container .monaco-inputbox input`;
-const INCLUDE_INPUT = `${VIEWLET} .query-details .monaco-inputbox input[aria-label="Search Include Patterns"]`;
+const INCLUDE_INPUT = `${VIEWLET} .query-details .monaco-inputbox input[aria-label="Search Include/Exclude Patterns"]`;
 
 export class Search extends Viewlet {
 

From d7e13a72dda03685278acb12b9e221c105642779 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 29 Mar 2018 19:30:48 -0700
Subject: [PATCH 224/383] OpenSearchViewlet before all search smoketests so
 they can run independently

---
 test/smoke/src/areas/search/search.test.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index a0e932298b6..dda020ef63b 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -21,6 +21,7 @@ export function setup() {
 
 		it('searches only for *.js files & checks for correct result number', async function () {
 			const app = this.app as SpectronApplication;
+			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.showQueryDetails();
 			await app.workbench.search.setFilesToIncludeText('*.js');
@@ -33,6 +34,7 @@ export function setup() {
 
 		it('dismisses result & checks for correct result number', async function () {
 			const app = this.app as SpectronApplication;
+			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.removeFileMatch(1);
 			await app.workbench.search.waitForResultText('10 results in 4 files');
@@ -41,6 +43,7 @@ export function setup() {
 		it('replaces first search result with a replace term', async function () {
 			const app = this.app as SpectronApplication;
 
+			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.expandReplace();
 			await app.workbench.search.setReplaceText('ydob');

From 6c22e21cdcd6811770ddcc0d8ac3174aaad03678 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 29 Mar 2018 19:32:14 -0700
Subject: [PATCH 225/383] Fix #44923 smoke test, save happens automatically
 after replace. See #46983

---
 test/smoke/src/areas/search/search.test.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index dda020ef63b..8ca6fb2f8bc 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -48,14 +48,12 @@ export function setup() {
 			await app.workbench.search.expandReplace();
 			await app.workbench.search.setReplaceText('ydob');
 			await app.workbench.search.replaceFileMatch(1);
-			await app.workbench.saveOpenedFile();
 
 			await app.workbench.search.waitForResultText('10 results in 4 files');
 
 			await app.workbench.search.searchFor('ydob');
 			await app.workbench.search.setReplaceText('body');
 			await app.workbench.search.replaceFileMatch(1);
-			await app.workbench.saveOpenedFile();
 		});
 	});
 }
\ No newline at end of file

From 9d58008fa1f8c421a0b10fe50f58033361a067fb Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 30 Mar 2018 11:24:02 +0200
Subject: [PATCH 226/383] Fix #45340

---
 .../api/node/extHostConfiguration.ts          |  6 +-
 .../api/extHostConfiguration.test.ts          | 83 +++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/node/extHostConfiguration.ts b/src/vs/workbench/api/node/extHostConfiguration.ts
index 93b2d217d8e..0b4830a4c8a 100644
--- a/src/vs/workbench/api/node/extHostConfiguration.ts
+++ b/src/vs/workbench/api/node/extHostConfiguration.ts
@@ -107,12 +107,16 @@ export class ExtHostConfiguration implements ExtHostConfigurationShape {
 						return isObject(target) ?
 							new Proxy(target, {
 								get: (target: any, property: string) => {
+									if (typeof property === 'string' && property.toLowerCase() === 'tojson') {
+										cloneTarget();
+										return () => clonedTarget;
+									}
 									if (clonedConfig) {
 										clonedTarget = clonedTarget ? clonedTarget : lookUp(clonedConfig, accessor);
 										return clonedTarget[property];
 									}
 									const result = target[property];
-									if (typeof property === 'string' && property.toLowerCase() !== 'tojson') {
+									if (typeof property === 'string') {
 										return cloneOnWriteProxy(result, `${accessor}.${property}`);
 									}
 									return result;
diff --git a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
index 382cbc08b75..4aae41a952d 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
@@ -17,6 +17,7 @@ import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { IWorkspaceFolder, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { NullLogService } from 'vs/platform/log/common/log';
+import { assign } from 'vs/base/common/objects';
 
 suite('ExtHostConfiguration', function () {
 
@@ -146,6 +147,88 @@ suite('ExtHostConfiguration', function () {
 		assert.equal(actual['statusBar.foreground'], 'somevalue');
 	});
 
+	test('Stringify returned configuration', function () {
+
+		const all = createExtHostConfiguration({
+			'farboo': {
+				'config0': true,
+				'nested': {
+					'config1': 42,
+					'config2': 'Das Pferd frisst kein Reis.'
+				},
+				'config4': ''
+			},
+			'workbench': {
+				'colorCustomizations': {
+					'statusBar.foreground': 'somevalue'
+				},
+				'emptyobjectkey': {
+				}
+			}
+		});
+
+		let testObject = all.getConfiguration();
+		let actual = testObject.get('farboo');
+		assert.deepEqual(JSON.stringify({
+			'config0': true,
+			'nested': {
+				'config1': 42,
+				'config2': 'Das Pferd frisst kein Reis.'
+			},
+			'config4': ''
+		}), JSON.stringify(actual));
+
+		assert.deepEqual(undefined, JSON.stringify(testObject.get('unknownkey')));
+
+		actual = testObject.get('farboo');
+		actual['config0'] = false;
+		assert.deepEqual(JSON.stringify({
+			'config0': false,
+			'nested': {
+				'config1': 42,
+				'config2': 'Das Pferd frisst kein Reis.'
+			},
+			'config4': ''
+		}), JSON.stringify(actual));
+
+		actual = testObject.get('workbench')['colorCustomizations'];
+		actual['statusBar.background'] = 'anothervalue';
+		assert.deepEqual(JSON.stringify({
+			'statusBar.foreground': 'somevalue',
+			'statusBar.background': 'anothervalue'
+		}), JSON.stringify(actual));
+
+		actual = testObject.get('workbench');
+		actual['unknownkey'] = 'somevalue';
+		assert.deepEqual(JSON.stringify({
+			'colorCustomizations': {
+				'statusBar.foreground': 'somevalue'
+			},
+			'emptyobjectkey': {},
+			'unknownkey': 'somevalue'
+		}), JSON.stringify(actual));
+
+		actual = all.getConfiguration('workbench').get('emptyobjectkey');
+		actual = assign(actual || {}, {
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		});
+		assert.deepEqual(JSON.stringify({
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		}), JSON.stringify(actual));
+
+		actual = all.getConfiguration('workbench').get('unknownkey');
+		actual = assign(actual || {}, {
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		});
+		assert.deepEqual(JSON.stringify({
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		}), JSON.stringify(actual));
+	});
+
 	test('cannot modify returned configuration', function () {
 
 		const all = createExtHostConfiguration({

From ea90500f5fdd214b74d7a93a47d80cf88fa0fd77 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Fri, 30 Mar 2018 10:00:10 -0700
Subject: [PATCH 227/383] Cacheddata file is created by VSCode and so is not
 customer content

---
 src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
index 77f1297d4ed..05e315fc95b 100644
--- a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
+++ b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
@@ -36,7 +36,7 @@ export class NodeCachedDataManager implements IWorkbenchContribution {
 				/* __GDPR__
 					"cachedDataError" : {
 						"errorCode" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-						"path": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
+						"path": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 					}
 				*/
 				this._telemetryService.publicLog('cachedDataError', {

From 1b4886dda92f1b84512a63425b33bf8b74482bb5 Mon Sep 17 00:00:00 2001
From: Gus Hurovich <gushurovich@gmail.com>
Date: Fri, 30 Mar 2018 11:24:54 -0700
Subject: [PATCH 228/383] Adding setting for disabling partial parsing in
 stylesheets (#46979)

* Adding setting for disabling partial parsing in stylesheets

* Added description
---
 extensions/emmet/package.json                     | 5 +++++
 extensions/emmet/package.nls.json                 | 3 ++-
 extensions/emmet/src/abbreviationActions.ts       | 3 ++-
 extensions/emmet/src/defaultCompletionProvider.ts | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 26c3a58b43a..5f85690927a 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -211,6 +211,11 @@
                     "type": "boolean",
                     "default": false,
                     "description": "%emmetShowSuggestionsAsSnippets%"
+                },
+                "emmet.optimizeStylesheetParsing": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "%emmetOptimizeStylesheetParsing%"
                 }
             }
         },
diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json
index 36a62bd2694..69c7b30cdaa 100644
--- a/extensions/emmet/package.nls.json
+++ b/extensions/emmet/package.nls.json
@@ -53,5 +53,6 @@
 	"emmetPreferencesCssMozProperties": "Comma separated CSS properties that get the 'moz' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'moz' prefix.",
 	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the 'o' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'o' prefix.",
 	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the 'ms' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'ms' prefix.",
-	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches."
+	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
+	"emmetOptimizeStylesheetParsing": "When set to false, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to true, only the content around the current position in css/scss/less files is parsed."
 }
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 9e50cc06cde..ad5934c6c99 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -228,7 +228,8 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 
 	const editor = vscode.window.activeTextEditor;
 	let rootNode: Node | undefined;
-	if (editor.selections.length === 1 && isStyleSheet(editor.document.languageId) && editor.document.lineCount > 1000) {
+	let usePartialParsing = vscode.workspace.getConfiguration('emmet')['optimizeStylesheetParsing'] === true;
+	if (editor.selections.length === 1 && isStyleSheet(editor.document.languageId) && usePartialParsing && editor.document.lineCount > 1000) {
 		rootNode = parsePartialStylesheet(editor.document, editor.selection.isReversed ? editor.selection.anchor : editor.selection.active);
 	} else {
 		rootNode = parseDocument(editor.document, false);
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 962171ba6b1..fd48a233324 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -40,7 +40,8 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			validateLocation = syntax === 'html' || isStyleSheet(document.languageId);
 			// If document can be css parsed, get currentNode
 			if (isStyleSheet(document.languageId)) {
-				rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>parseDocument(document, false);
+				let usePartialParsing = vscode.workspace.getConfiguration('emmet')['optimizeStylesheetParsing'] === true;
+				rootNode = usePartialParsing && document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>parseDocument(document, false);
 				if (!rootNode) {
 					return;
 				}

From cd519e01b5600220d74d818a81a299a78c3c4608 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Fri, 30 Mar 2018 11:25:59 -0700
Subject: [PATCH 229/383] GDPR reclassification

---
 src/vs/workbench/parts/stats/node/workspaceStats.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/stats/node/workspaceStats.ts b/src/vs/workbench/parts/stats/node/workspaceStats.ts
index 71c6572e0b9..686fea24971 100644
--- a/src/vs/workbench/parts/stats/node/workspaceStats.ts
+++ b/src/vs/workbench/parts/stats/node/workspaceStats.ts
@@ -359,7 +359,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			set.forEach(item => list.push(item));
 			/* __GDPR__
 				"workspace.remotes" : {
-					"domains" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+					"domains" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				}
 			*/
 			this.telemetryService.publicLog('workspace.remotes', { domains: list.sort() });

From c70a79e0097c5100b6bc96fe407e0e525bb02641 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Fri, 30 Mar 2018 15:06:30 -0700
Subject: [PATCH 230/383] OSS tools

---
 ThirdPartyNotices.txt | 98 +++++++++++++++++++++----------------------
 package.json          |  2 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index b0e4112b770..4c4a9b9d6b6 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -14,31 +14,31 @@ This project incorporates components from the projects listed below. The origina
 7.	atom/language-sass version 0.52.0 (https://github.com/atom/language-sass)
 8.	atom/language-shellscript (https://github.com/atom/language-shellscript)
 9.	atom/language-xml (https://github.com/atom/language-xml)
-10.	Benvie/JavaScriptNext.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
-11.	chjj-marked version 0.3.12 (https://github.com/npmcomponent/chjj-marked)
-12.	chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
-13.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
-14.	daaain/Handlebars (https://github.com/daaain/Handlebars)
-15.	davidrios/jade-tmbundle (https://github.com/davidrios/jade-tmbundle)
-16.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
-17.	demyte/language-cshtml (https://github.com/demyte/language-cshtml)
-18.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-19.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-20.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
-21.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-22.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-23.	Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
-24.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
-25.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-26.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-27.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-28.	language-docker (https://github.com/moby/moby)
-29.	language-go version 0.39.0 (https://github.com/atom/language-go)
-30.	language-less (https://github.com/atom/language-less)
-31.	language-php (https://github.com/atom/language-php)
-32.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
-33.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
-34.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
+10.	chjj-marked version 0.3.18 (https://github.com/npmcomponent/chjj-marked)
+11.	chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
+12.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
+13.	daaain/Handlebars (https://github.com/daaain/Handlebars)
+14.	davidrios/jade-tmbundle (https://github.com/davidrios/jade-tmbundle)
+15.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
+16.	demyte/language-cshtml (https://github.com/demyte/language-cshtml)
+17.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
+18.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
+19.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
+20.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
+21.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
+22.	Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
+23.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
+24.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
+25.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
+26.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
+27.	language-docker (https://github.com/moby/moby)
+28.	language-go version 0.39.0 (https://github.com/atom/language-go)
+29.	language-less (https://github.com/atom/language-less)
+30.	language-php (https://github.com/atom/language-php)
+31.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
+32.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
+33.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
+34.	Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
 35.	Microsoft/vscode-mssql (https://github.com/Microsoft/vscode-mssql)
 36.	mmims/language-batchfile (https://github.com/mmims/language-batchfile)
 37.	octicons-code version 3.1.0 (https://octicons.github.com)
@@ -446,30 +446,6 @@ suitability for any purpose.
 =========================================
 END OF atom/language-xml NOTICES AND INFORMATION
 
-%% Benvie/JavaScriptNext.tmLanguage NOTICES AND INFORMATION BEGIN HERE
-=========================================
-vscode-JSON.tmLanguage
-
-Copyright (c) Microsoft Corporation
-
-All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-documentation files (the ""Software""), to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF Benvie/JavaScriptNext.tmLanguage NOTICES AND INFORMATION
-
 %% chjj-marked NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -1326,6 +1302,30 @@ THE SOFTWARE.
 =========================================
 END OF Microsoft/TypeScript-TmLanguage NOTICES AND INFORMATION
 
+%% Microsoft/vscode-JSON.tmLanguage NOTICES AND INFORMATION BEGIN HERE
+=========================================
+vscode-JSON.tmLanguage
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the ""Software""), to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF Microsoft/vscode-JSON.tmLanguage NOTICES AND INFORMATION
+
 %% Microsoft/vscode-mssql NOTICES AND INFORMATION BEGIN HERE
 =========================================
 ------------------------------------------ START OF LICENSE -----------------------------------------
diff --git a/package.json b/package.json
index fd5f7ab7af6..db98c8793dd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.22.0",
-  "distro": "6e8c6e1a8dc5df53e357062bee4f14a1843c2249",
+  "distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
   "author": {
     "name": "Microsoft Corporation"
   },

From ceb93e7e47923133409594a6251271f6e0c8b271 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 30 Mar 2018 17:17:20 -0700
Subject: [PATCH 231/383] Revert "OpenSearchViewlet before all search
 smoketests so they can run independently"

This reverts commit d7e13a72dda03685278acb12b9e221c105642779.
---
 test/smoke/src/areas/search/search.test.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index 8ca6fb2f8bc..4b0a5e837d9 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -21,7 +21,6 @@ export function setup() {
 
 		it('searches only for *.js files & checks for correct result number', async function () {
 			const app = this.app as SpectronApplication;
-			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.showQueryDetails();
 			await app.workbench.search.setFilesToIncludeText('*.js');
@@ -34,7 +33,6 @@ export function setup() {
 
 		it('dismisses result & checks for correct result number', async function () {
 			const app = this.app as SpectronApplication;
-			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.removeFileMatch(1);
 			await app.workbench.search.waitForResultText('10 results in 4 files');
@@ -43,7 +41,6 @@ export function setup() {
 		it('replaces first search result with a replace term', async function () {
 			const app = this.app as SpectronApplication;
 
-			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.expandReplace();
 			await app.workbench.search.setReplaceText('ydob');

From 3ba3c95b84b1bf80613388557df769a1a2860328 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Fri, 30 Mar 2018 17:38:03 -0700
Subject: [PATCH 232/383] Fix failing Statusbar smoke tests

---
 .../workbench/parts/tasks/electron-browser/task.contribution.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
index 6ce2cb1fe71..7bf86924378 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -146,6 +146,7 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 		const infoTitle = n => nls.localize('totalInfos', "{0} Infos", n);
 
 		Dom.addClass(element, 'task-statusbar-item');
+		element.title = nls.localize('problems', "Problems");
 
 		Dom.addClass(label, 'task-statusbar-item-label');
 		element.appendChild(label);

From b66f0ba3c70b08ffc046a9f1a6f56e0260129540 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Fri, 30 Mar 2018 18:20:01 -0700
Subject: [PATCH 233/383] bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db98c8793dd..7881dab829e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "code-oss-dev",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
   "author": {
     "name": "Microsoft Corporation"

From 2b67a247b536baaba715e099f3adad1ed907658b Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 31 Mar 2018 13:05:41 -0700
Subject: [PATCH 234/383] Add null check when there is no active file

---
 .../execution/electron-browser/execution.contribution.ts  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
index 5c9ce1a497f..83bcd7ab055 100644
--- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
@@ -118,9 +118,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		if (root) {
 			terminalService.openTerminal(root.fsPath);
 		} else {
-			//Opens current file's folder, if no folder is open in editor
-			const path = historyService.getLastActiveFile().fsPath;
-			terminalService.openTerminal(paths.dirname(path));
+			// Opens current file's folder, if no folder is open in editor
+			const activeFile = historyService.getLastActiveFile();
+			if (activeFile) {
+				terminalService.openTerminal(paths.dirname(activeFile.fsPath));
+			}
 		}
 	}
 });

From 95c53efbac6b8b15858b20fa49a6cc12c4cc8097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 11:50:19 +0200
Subject: [PATCH 235/383] fix typo

---
 src/vs/workbench/parts/debug/browser/debugContentProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
index 90cd905c6ca..d8bd735c8bb 100644
--- a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
+++ b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
@@ -23,7 +23,7 @@ import { Source } from 'vs/workbench/parts/debug/common/debugSource';
  *       debug:arbitrary_path?session=123e4567-e89b-12d3-a456-426655440000&ref=1016
  *       \___/ \____________/ \__________________________________________/ \______/
  *         |          |                             |                          |
- *      scheme   source.path                    session id            source.referencequery
+ *      scheme   source.path                    session id            source.reference
  *
  * the arbitrary_path and the session id are encoded with 'encodeURIComponent'
  *

From a6735b5da3fd61a326cfa7ea1c1c4020867821af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 11:53:08 +0200
Subject: [PATCH 236/383] make IProcess.sources private

---
 src/vs/workbench/parts/debug/common/debug.ts      | 2 +-
 src/vs/workbench/parts/debug/common/debugModel.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index f8329099438..d3be88dc9a2 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -140,8 +140,8 @@ export interface IProcess extends ITreeElement {
 	getName(includeRoot: boolean): string;
 	configuration: IConfig;
 	session: ISession;
-	sources: Map<string, Source>;
 	state: ProcessState;
+	getSourceForUri(modelUri: uri): Source;
 	getThread(threadId: number): IThread;
 	getAllThreads(): IThread[];
 	getSource(raw: DebugProtocol.Source): Source;
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index b07273aaf54..a8acaf4dcd3 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -532,8 +532,9 @@ export class Thread implements IThread {
 
 export class Process implements IProcess {
 
-	public sources: Map<string, Source>;
+	private sources: Map<string, Source>;
 	private threads: Map<number, Thread>;
+
 	public inactive = true;
 
 	constructor(public configuration: IConfig, private _session: ISession & ITreeElement) {
@@ -558,6 +559,10 @@ export class Process implements IProcess {
 		return this.configuration.type === 'attach' ? ProcessState.ATTACH : ProcessState.LAUNCH;
 	}
 
+	public getSourceForUri(modelUri: uri): Source {
+		return this.sources.get(modelUri.toString());
+	}
+
 	public getSource(raw: DebugProtocol.Source): Source {
 		let source = new Source(raw, this.getId());
 		if (this.sources.has(source.uri.toString())) {

From e059d12951ecbfd93673f74e03521a60149ae6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 11:58:34 +0200
Subject: [PATCH 237/383] fix silly loop

---
 src/vs/workbench/parts/debug/common/debugModel.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index a8acaf4dcd3..0e41c8065b3 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -677,6 +677,13 @@ export class Process implements IProcess {
 			return result;
 		}, err => []);
 	}
+
+	setNotAvailable(modelUri: uri) {
+		const source = this.sources.get(modelUri.toString());
+		if (source) {
+			source.available = false;
+		}
+	}
 }
 
 export class Breakpoint implements IBreakpoint {
@@ -1101,11 +1108,7 @@ export class Model implements IModel {
 	}
 
 	public sourceIsNotAvailable(uri: uri): void {
-		this.processes.forEach(p => {
-			if (p.sources.has(uri.toString())) {
-				p.sources.get(uri.toString()).available = false;
-			}
-		});
+		this.processes.forEach(p => p.setNotAvailable(uri));
 		this._onDidChangeCallStack.fire();
 	}
 

From b85ed5eec0da1aabef1aa63c90ca936929f6f8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 11:59:26 +0200
Subject: [PATCH 238/383] add comments

---
 .../workbench/parts/debug/common/debugSource.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/debug/common/debugSource.ts b/src/vs/workbench/parts/debug/common/debugSource.ts
index a1c372db5a0..c2ff61f69fe 100644
--- a/src/vs/workbench/parts/debug/common/debugSource.ts
+++ b/src/vs/workbench/parts/debug/common/debugSource.ts
@@ -15,6 +15,20 @@ import { Schemas } from 'vs/base/common/network';
 
 const UNKNOWN_SOURCE_LABEL = nls.localize('unknownSource', "Unknown Source");
 
+/**
+ * Debug URI format
+ *
+ * a debug URI represents a Source object and the debug session where the Source comes from.
+ *
+ *       debug:arbitrary_path?session=123e4567-e89b-12d3-a456-426655440000&ref=1016
+ *       \___/ \____________/ \__________________________________________/ \______/
+ *         |          |                             |                          |
+ *      scheme   source.path                    session id            source.reference
+ *
+ * the arbitrary_path and the session id are encoded with 'encodeURIComponent'
+ *
+ */
+
 export class Source {
 
 	public readonly uri: uri;
@@ -30,8 +44,9 @@ export class Source {
 			this.uri = uri.parse(`${DEBUG_SCHEME}:${encodeURIComponent(path)}?session=${encodeURIComponent(sessionId)}&ref=${this.raw.sourceReference}`);
 		} else {
 			if (paths.isAbsolute(path)) {
-				this.uri = uri.file(path); // path should better be absolute!
+				this.uri = uri.file(path);
 			} else {
+				// assume that path is a URI
 				this.uri = uri.parse(path);
 			}
 		}

From 5f909be8397dcb78a9b6be4e2cf4df95fbf160b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 14:16:04 +0200
Subject: [PATCH 239/383] use getSourceForUri

---
 src/vs/workbench/parts/debug/browser/debugContentProvider.ts  | 2 +-
 src/vs/workbench/parts/debug/electron-browser/debugService.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
index d8bd735c8bb..7ca6eb20b7e 100644
--- a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
+++ b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
@@ -58,7 +58,7 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 		if (!process) {
 			return TPromise.wrapError<ITextModel>(new Error(localize('unable', "Unable to resolve the resource without a debug session")));
 		}
-		const source = process.sources.get(resource.toString());
+		const source = process.getSourceForUri(resource);
 		let rawSource: DebugProtocol.Source;
 		if (source) {
 			rawSource = source.raw;
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 276910af561..dac7598ff82 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -1207,7 +1207,7 @@ export class DebugService implements debug.IDebugService {
 
 			const breakpointsToSend = this.model.getBreakpoints().filter(bp => this.model.areBreakpointsActivated() && bp.enabled && bp.uri.toString() === modelUri.toString());
 
-			const source = process.sources.get(modelUri.toString());
+			const source = process.getSourceForUri(modelUri);
 			let rawSource: DebugProtocol.Source;
 			if (source) {
 				rawSource = source.raw;

From d384b85e1c4e29d29bd66c56d8a606f790ac4331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 17:12:47 +0200
Subject: [PATCH 240/383] add missing attribute to interface

---
 src/vs/workbench/parts/debug/common/debug.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index d3be88dc9a2..5524d16960d 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -256,6 +256,7 @@ export interface IBreakpoint extends IBaseBreakpoint {
 	column: number;
 	endColumn?: number;
 	message: string;
+	adapterData: any;
 }
 
 export interface IFunctionBreakpoint extends IBaseBreakpoint {

From 34912d285a270bc0374dcd83b9d3fd7a98d77e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 17:15:48 +0200
Subject: [PATCH 241/383] avoid unnecessary work

---
 src/vs/workbench/parts/debug/electron-browser/debugService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index dac7598ff82..5c53c0df697 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -1205,7 +1205,7 @@ export class DebugService implements debug.IDebugService {
 				return TPromise.as(null);
 			}
 
-			const breakpointsToSend = this.model.getBreakpoints().filter(bp => this.model.areBreakpointsActivated() && bp.enabled && bp.uri.toString() === modelUri.toString());
+			const breakpointsToSend = this.model.getActivatedBreakpointsForResource(modelUri).filter(bp => bp.enabled);
 
 			const source = process.getSourceForUri(modelUri);
 			let rawSource: DebugProtocol.Source;

From 8700b5862dec1dad3a59d6a41bce3cb0bb59cce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 17:17:36 +0200
Subject: [PATCH 242/383] avoid unnecessary uri.toString()

---
 src/vs/workbench/parts/debug/electron-browser/debugService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 5c53c0df697..af8dd4aeada 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -1303,8 +1303,8 @@ export class DebugService implements debug.IDebugService {
 		}
 
 		fileChangesEvent.getUpdated().forEach(event => {
-			if (this.breakpointsToSendOnResourceSaved.has(event.resource.toString())) {
-				this.breakpointsToSendOnResourceSaved.delete(event.resource.toString());
+
+			if (this.breakpointsToSendOnResourceSaved.delete(event.resource.toString())) {
 				this.sendBreakpoints(event.resource, true).done(null, errors.onUnexpectedError);
 			}
 			if (event.resource.toString().indexOf('.vscode/launch.json') >= 0) {

From e266e0a0a030cefcc690dd10cf3dce57cc8398f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 17:20:31 +0200
Subject: [PATCH 243/383] fix return types to interfaces

---
 src/vs/workbench/parts/debug/common/debugModel.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index 0e41c8065b3..85784598978 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -851,7 +851,7 @@ export class Model implements IModel {
 		return thread.fetchCallStack();
 	}
 
-	public getBreakpoints(): Breakpoint[] {
+	public getBreakpoints(): IBreakpoint[] {
 		return this.breakpoints;
 	}
 
@@ -882,7 +882,7 @@ export class Model implements IModel {
 		this._onDidChangeBreakpoints.fire();
 	}
 
-	public addBreakpoints(uri: uri, rawData: IBreakpointData[], fireEvent = true): Breakpoint[] {
+	public addBreakpoints(uri: uri, rawData: IBreakpointData[], fireEvent = true): IBreakpoint[] {
 		const newBreakpoints = rawData.map(rawBp => new Breakpoint(uri, rawBp.lineNumber, rawBp.column, rawBp.enabled, rawBp.condition, rawBp.hitCondition, rawBp.logMessage, undefined, rawBp.id));
 		this.breakpoints = this.breakpoints.concat(newBreakpoints);
 		this.breakpointsActivated = true;
@@ -987,7 +987,7 @@ export class Model implements IModel {
 		this._onDidChangeBreakpoints.fire({ changed: changed });
 	}
 
-	public addFunctionBreakpoint(functionName: string, id: string): FunctionBreakpoint {
+	public addFunctionBreakpoint(functionName: string, id: string): IFunctionBreakpoint {
 		const newFunctionBreakpoint = new FunctionBreakpoint(functionName, true, undefined, undefined, undefined, id);
 		this.functionBreakpoints.push(newFunctionBreakpoint);
 		this._onDidChangeBreakpoints.fire({ added: [newFunctionBreakpoint] });

From 345ad41c882245fd2ec55c91087f3bfc5fcaae2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 17:22:15 +0200
Subject: [PATCH 244/383] improve breakpoint model api

---
 src/vs/workbench/parts/debug/common/debugModel.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index 85784598978..303fc12498a 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -855,6 +855,19 @@ export class Model implements IModel {
 		return this.breakpoints;
 	}
 
+	public getBreakpointsForResource(resource: uri): IBreakpoint[] {
+		const uriString = resource.toString();
+		return this.breakpoints.filter(bp => bp.uri.toString() === uriString);
+	}
+
+	public getActivatedBreakpointsForResource(resource: uri): IBreakpoint[] {
+		if (this.breakpointsActivated) {
+			const uriString = resource.toString();
+			return this.breakpoints.filter(bp => bp.uri.toString() === uriString);
+		}
+		return [];
+	}
+
 	public getFunctionBreakpoints(): IFunctionBreakpoint[] {
 		return this.functionBreakpoints;
 	}

From 397b45b76dba2e9f0520664d1527b3d526fe4ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Sat, 31 Mar 2018 17:36:36 +0200
Subject: [PATCH 245/383] cleanup breakpoint class hierarchy

---
 .../parts/debug/common/debugModel.ts          | 83 +++++++++++--------
 1 file changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index 303fc12498a..3613bcc3c04 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -20,7 +20,7 @@ import { ISuggestion } from 'vs/editor/common/modes';
 import { Position } from 'vs/editor/common/core/position';
 import {
 	ITreeElement, IExpression, IExpressionContainer, IProcess, IStackFrame, IExceptionBreakpoint, IBreakpoint, IFunctionBreakpoint, IModel, IReplElementSource,
-	IConfig, ISession, IThread, IRawModelUpdate, IScope, IRawStoppedDetails, IEnablement, IBreakpointData, IExceptionInfo, IReplElement, ProcessState, IBreakpointsChangeEvent, IBreakpointUpdateData
+	IConfig, ISession, IThread, IRawModelUpdate, IScope, IRawStoppedDetails, IEnablement, IBreakpointData, IExceptionInfo, IReplElement, ProcessState, IBreakpointsChangeEvent, IBreakpointUpdateData, IBaseBreakpoint
 } from 'vs/workbench/parts/debug/common/debug';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -686,10 +686,39 @@ export class Process implements IProcess {
 	}
 }
 
-export class Breakpoint implements IBreakpoint {
+export class Enablement implements IEnablement {
+	constructor(
+		public enabled: boolean,
+		private id: string
+	) { }
+
+	public getId(): string {
+		return this.id;
+	}
+}
+
+export class BaseBreakpoint extends Enablement implements IBaseBreakpoint {
 
 	public verified: boolean;
 	public idFromAdapter: number;
+
+	constructor(
+		enabled: boolean,
+		public hitCondition: string,
+		public condition: string,
+		public logMessage: string,
+		id: string
+	) {
+		super(enabled, id);
+		if (enabled === undefined) {
+			this.enabled = true;
+		}
+		this.verified = false;
+	}
+}
+
+export class Breakpoint extends BaseBreakpoint implements IBreakpoint {
+
 	public message: string;
 	public endLineNumber: number;
 	public endColumn: number;
@@ -698,48 +727,34 @@ export class Breakpoint implements IBreakpoint {
 		public uri: uri,
 		public lineNumber: number,
 		public column: number,
-		public enabled: boolean,
-		public condition: string,
-		public hitCondition: string,
-		public logMessage: string,
+		enabled: boolean,
+		condition: string,
+		hitCondition: string,
+		logMessage: string,
 		public adapterData: any,
-		private id = generateUuid()
+		id = generateUuid()
 	) {
-		if (enabled === undefined) {
-			this.enabled = true;
-		}
-		this.verified = false;
-	}
-
-	public getId(): string {
-		return this.id;
+		super(enabled, hitCondition, condition, logMessage, id);
 	}
 }
 
-export class FunctionBreakpoint implements IFunctionBreakpoint {
+export class FunctionBreakpoint extends BaseBreakpoint implements IFunctionBreakpoint {
 
-	public verified: boolean;
-	public idFromAdapter: number;
-
-	constructor(public name: string, public enabled: boolean, public hitCondition: string, public condition: string, public logMessage: string, private id = generateUuid()) {
-		this.verified = false;
-	}
-
-	public getId(): string {
-		return this.id;
+	constructor(
+		public name: string,
+		enabled: boolean,
+		hitCondition: string,
+		condition: string,
+		logMessage: string,
+		id = generateUuid()) {
+		super(enabled, hitCondition, condition, logMessage, id);
 	}
 }
 
-export class ExceptionBreakpoint implements IExceptionBreakpoint {
+export class ExceptionBreakpoint extends Enablement implements IExceptionBreakpoint {
 
-	private id: string;
-
-	constructor(public filter: string, public label: string, public enabled: boolean) {
-		this.id = generateUuid();
-	}
-
-	public getId(): string {
-		return this.id;
+	constructor(public filter: string, public label: string, enabled: boolean) {
+		super(enabled, generateUuid());
 	}
 }
 

From bfad02e2252b3fc0173e35e53abdc31d806fb4ff Mon Sep 17 00:00:00 2001
From: DAVID DRUKER <daviddruker@DAVIDs-MacBook-Pro.local>
Date: Sat, 31 Mar 2018 13:29:25 -0700
Subject: [PATCH 246/383] add action to clear terminal selection

---
 .../electron-browser/terminal.contribution.ts |  7 ++++++-
 .../electron-browser/terminalActions.ts       | 21 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index cb8d09e8f02..313a89c4b0e 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -18,7 +18,7 @@ import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, ClearTerminalSelection, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -244,6 +244,7 @@ configurationRegistry.registerConfiguration({
 				ScrollUpPageTerminalAction.ID,
 				ScrollToTopTerminalAction.ID,
 				ClearTerminalAction.ID,
+				ClearTerminalSelection.ID,
 				debugActions.StartAction.ID,
 				debugActions.StopAction.ID,
 				debugActions.RunAction.ID,
@@ -346,6 +347,10 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewTermina
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKTICK,
 	mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.US_BACKTICK }
 }), 'Terminal: Create New Integrated Terminal', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearTerminalSelection, ClearTerminalSelection.ID, ClearTerminalSelection.LABEL, {
+	primary: KeyCode.Escape,
+	linux: { primary: KeyCode.Escape }
+}, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED), 'Terminal: Escape selection', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewInActiveWorkspaceTerminalAction, CreateNewInActiveWorkspaceTerminalAction.ID, CreateNewInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Create New Integrated Terminal (In Active Workspace)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusActiveTerminalAction, FocusActiveTerminalAction.ID, FocusActiveTerminalAction.LABEL), 'Terminal: Focus Terminal', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextTerminalAction, FocusNextTerminalAction.ID, FocusNextTerminalAction.LABEL), 'Terminal: Focus Next Terminal', category);
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 41feb0c3536..af284112528 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -787,6 +787,27 @@ export class ClearTerminalAction extends Action {
 	}
 }
 
+export class ClearTerminalSelection extends Action {
+
+	public static readonly ID = 'workbench.action.terminal.clearSelection';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.clearSelection', "Clear Selection");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		let terminalInstance = this.terminalService.getActiveInstance();
+		if (terminalInstance && terminalInstance.hasSelection()) {
+			terminalInstance.clearSelection();
+		}
+		return TPromise.as(void 0);
+	}
+}
+
 export class AllowWorkspaceShellTerminalCommand extends Action {
 
 	public static readonly ID = 'workbench.action.terminal.allowWorkspaceShell';

From 67b39574737db21deba325136f421166a9fdec8d Mon Sep 17 00:00:00 2001
From: Florian Traber <github@floriantraber.de>
Date: Sun, 1 Apr 2018 09:39:41 +0200
Subject: [PATCH 247/383] #46860 make git delete popup modal

---
 extensions/git/src/commands.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 7cf5d096d7e..e37383c4932 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1205,7 +1205,7 @@ export class CommandCenter {
 
 			const message = localize('confirm force delete branch', "The branch '{0}' is not fully merged. Delete anyway?", name);
 			const yes = localize('delete branch', "Delete Branch");
-			const pick = await window.showWarningMessage(message, yes);
+			const pick = await window.showWarningMessage(message, { modal: true }, yes);
 
 			if (pick === yes) {
 				await run(true);

From 15a30c0edbb79dff6198f31d37e5bb37f7b4e041 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Sun, 1 Apr 2018 10:00:52 +0200
Subject: [PATCH 248/383] Clear any selection (fixes #46926)

---
 .../browser/parts/quickinput/quickInputCheckboxList.ts       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index d394f9fa108..8572fab95c7 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -199,6 +199,11 @@ export class QuickInputCheckboxList {
 				this._onLeave.fire();
 			}
 		}));
+		this.disposables.push(this.list.onSelectionChange(e => {
+			if (e.elements.length) {
+				this.list.setSelection([]);
+			}
+		}));
 	}
 
 	@memoize

From 6055a9dfe8f728a92cd1752277e34c84f5a56672 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Sun, 1 Apr 2018 10:02:07 +0200
Subject: [PATCH 249/383] Reveal focused item (fixes #46752)

---
 .../workbench/browser/parts/quickinput/quickInputCheckboxList.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index 8572fab95c7..e6936880156 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -274,6 +274,7 @@ export class QuickInputCheckboxList {
 
 	focus(what: 'First' | 'Last' | 'Next' | 'Previous' | 'NextPage' | 'PreviousPage'): void {
 		this.list['focus' + what]();
+		this.list.reveal(this.list.getFocus()[0]);
 	}
 
 	domFocus() {

From 9cd482c5f99a26302c56fc009f4832bf6bc45d51 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Sun, 1 Apr 2018 10:04:30 +0200
Subject: [PATCH 250/383] No initial focus item (fixes #46949)

---
 .../workbench/browser/parts/quickinput/quickInput.ts   |  1 +
 .../browser/parts/quickinput/quickInputCheckboxList.ts | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index c980d5e8c96..23478edf3fe 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -137,6 +137,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 			// Defer to avoid the input field reacting to the triggering key.
 			setTimeout(() => {
 				this.inputBox.setFocus();
+				this.checkboxList.clearFocus();
 			}, 0);
 		}));
 		this.toUnbind.push(
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
index e6936880156..fa0763bf1af 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -263,8 +263,7 @@ export class QuickInputCheckboxList {
 		}));
 		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents())));
 		this.list.splice(0, this.list.length, this.elements);
-		this.list.setSelection([]);
-		this.list.focusFirst();
+		this.list.setFocus([]);
 	}
 
 	getCheckedElements() {
@@ -277,6 +276,10 @@ export class QuickInputCheckboxList {
 		this.list.reveal(this.list.getFocus()[0]);
 	}
 
+	clearFocus() {
+		this.list.setFocus([]);
+	}
+
 	domFocus() {
 		this.list.domFocus();
 	}
@@ -329,8 +332,7 @@ export class QuickInputCheckboxList {
 		});
 
 		this.list.splice(0, this.list.length, this.elements.filter(element => !element.hidden));
-		this.list.setSelection([]);
-		this.list.focusFirst();
+		this.list.setFocus([]);
 		this.list.layout();
 
 		this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());

From 9250653aedc75c233aeb5ba648c9260defeb1d51 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 2 Apr 2018 07:16:22 -0700
Subject: [PATCH 251/383] Cover case where find widget is visible

---
 .../terminal/electron-browser/terminal.contribution.ts | 10 +++++-----
 .../parts/terminal/electron-browser/terminalActions.ts |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index 313a89c4b0e..4ff8b5479e0 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -13,12 +13,12 @@ import * as panel from 'vs/workbench/browser/panel';
 import * as platform from 'vs/base/common/platform';
 import * as terminalCommands from 'vs/workbench/parts/terminal/electron-browser/terminalCommands';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE } from 'vs/workbench/parts/terminal/common/terminal';
 import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/electron-browser/terminal';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, ClearTerminalSelection, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, ClearSelectionTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -244,7 +244,7 @@ configurationRegistry.registerConfiguration({
 				ScrollUpPageTerminalAction.ID,
 				ScrollToTopTerminalAction.ID,
 				ClearTerminalAction.ID,
-				ClearTerminalSelection.ID,
+				ClearSelectionTerminalAction.ID,
 				debugActions.StartAction.ID,
 				debugActions.StopAction.ID,
 				debugActions.RunAction.ID,
@@ -347,10 +347,10 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewTermina
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKTICK,
 	mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.US_BACKTICK }
 }), 'Terminal: Create New Integrated Terminal', category);
-actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearTerminalSelection, ClearTerminalSelection.ID, ClearTerminalSelection.LABEL, {
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearSelectionTerminalAction, ClearSelectionTerminalAction.ID, ClearSelectionTerminalAction.LABEL, {
 	primary: KeyCode.Escape,
 	linux: { primary: KeyCode.Escape }
-}, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED), 'Terminal: Escape selection', category);
+}, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE)), 'Terminal: Escape selection', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewInActiveWorkspaceTerminalAction, CreateNewInActiveWorkspaceTerminalAction.ID, CreateNewInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Create New Integrated Terminal (In Active Workspace)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusActiveTerminalAction, FocusActiveTerminalAction.ID, FocusActiveTerminalAction.LABEL), 'Terminal: Focus Terminal', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextTerminalAction, FocusNextTerminalAction.ID, FocusNextTerminalAction.LABEL), 'Terminal: Focus Next Terminal', category);
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index af284112528..9771405d9d3 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -787,7 +787,7 @@ export class ClearTerminalAction extends Action {
 	}
 }
 
-export class ClearTerminalSelection extends Action {
+export class ClearSelectionTerminalAction extends Action {
 
 	public static readonly ID = 'workbench.action.terminal.clearSelection';
 	public static readonly LABEL = nls.localize('workbench.action.terminal.clearSelection', "Clear Selection");

From ba0580f92701ec07a1902c782b60cb7359dddfb5 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Mon, 2 Apr 2018 10:32:58 -0700
Subject: [PATCH 252/383] Inherit user env in issue reporter, fixes #46914

---
 src/vs/code/electron-browser/issue/issueReporter.js | 7 +++++++
 src/vs/code/electron-main/app.ts                    | 2 +-
 src/vs/platform/issue/electron-main/issueService.ts | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index 423dbe75a1c..5b246f9491b 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -9,6 +9,11 @@ const path = require('path');
 const fs = require('fs');
 const remote = require('electron').remote;
 
+function assign(destination, source) {
+	return Object.keys(source)
+		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
+}
+
 function parseURLQueryArgs() {
 	const search = window.location.search || '';
 
@@ -44,6 +49,8 @@ function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
 
+	assign(process.env, configuration.userEnv);
+
 	//#region Add support for using node_modules.asar
 	(function () {
 		const path = require('path');
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 6a255ddf114..47b3b15b814 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -325,7 +325,7 @@ export class CodeApplication {
 		services.set(IWindowsMainService, new SyncDescriptor(WindowsManager, machineId));
 		services.set(IWindowsService, new SyncDescriptor(WindowsService, this.sharedProcess));
 		services.set(ILaunchService, new SyncDescriptor(LaunchService));
-		services.set(IIssueService, new SyncDescriptor(IssueService, machineId));
+		services.set(IIssueService, new SyncDescriptor(IssueService, machineId, this.userEnv));
 
 		// Telemtry
 		if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index ce01cabbc9e..7232efc90fb 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -14,7 +14,7 @@ import { BrowserWindow, ipcMain, screen } from 'electron';
 import { ILaunchService } from 'vs/code/electron-main/launch';
 import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { isMacintosh } from 'vs/base/common/platform';
+import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 
 const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
@@ -26,9 +26,10 @@ export class IssueService implements IIssueService {
 
 	constructor(
 		private machineId: string,
+		private userEnv: IProcessEnvironment,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ILaunchService private launchService: ILaunchService,
-		@ILogService private logService: ILogService
+		@ILogService private logService: ILogService,
 	) { }
 
 	openReporter(data: IssueReporterData): TPromise<void> {
@@ -171,6 +172,7 @@ export class IssueService implements IIssueService {
 			nodeCachedDataDir: this.environmentService.nodeCachedDataDir,
 			windowId: this._issueWindow.id,
 			machineId: this.machineId,
+			userEnv: this.userEnv,
 			data,
 			features
 		};

From 24e9ce5519073e35d056ded120fd108361295ec7 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 2 Apr 2018 19:43:54 +0200
Subject: [PATCH 253/383] #43813 Revert rename

---
 .../node/extensionManagementService.ts            | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index ac6b4972b71..a938aa1e411 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -401,10 +401,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
-		const tempPath = path.join(this.extensionsPath, `.${id}`);
 		const extensionPath = path.join(this.extensionsPath, id);
-		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
-			.then(null, e => this.extract(id, zipPath, path.join(this.extensionsPath, id)))
+		return this.extract(id, zipPath, extensionPath)
 			.then(() => {
 				this.logService.info('Installation completed.', id);
 				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
@@ -418,17 +416,6 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
-	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string): TPromise<void> {
-		return this.extract(id, zipPath, extractPath)
-			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (5 * 1000) /* Retry for 5 seconds */)
-				.then(
-					() => this.logService.info('Renamed to', renamePath),
-					e => {
-						this.logService.info('Rename failed. Deleting from extracted location', extractPath);
-						return always(pfs.rimraf(extractPath), () => null).then(() => TPromise.wrapError(e));
-					}));
-	}
-
 	private extract(id: string, zipPath: string, extractPath: string): TPromise<void> {
 		this.logService.trace(`Started extracting the extension from ${zipPath} to ${extractPath}`);
 		return pfs.rimraf(extractPath)

From deefeadb1e25e2db656af1b9e7af26fb6d64687c Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Mon, 2 Apr 2018 11:07:19 -0700
Subject: [PATCH 254/383] Sort extensions list in issue reporter, fixes #46968

---
 .../issue/issueReporterMain.ts                | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 6af83069392..d87232cf697 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -781,9 +781,34 @@ export class IssueReporter extends Disposable {
 	}
 
 	private updateExtensionSelector(extensions: ILocalExtension[]): void {
-		const makeOption = (extension: ILocalExtension) => `<option value="${extension.identifier.id}">${escape(extension.manifest.displayName || extension.manifest.name || '')}</option>`;
+		interface IOption {
+			name: string;
+			id: string;
+		}
+
+		const extensionOptions: IOption[] = extensions.map(extension => {
+			return {
+				name: extension.manifest.displayName || extension.manifest.name || '',
+				id: extension.identifier.id
+			};
+		});
+
+		// Sort extensions by name
+		extensionOptions.sort((a, b) => {
+			if (a.name > b.name) {
+				return 1;
+			}
+
+			if (a.name < b.name) {
+				return -1;
+			}
+
+			return 0;
+		});
+
+		const makeOption = (extension: IOption) => `<option value="${extension.id}">${escape(extension.name)}</option>`;
 		const extensionsSelector = document.getElementById('extension-selector');
-		extensionsSelector.innerHTML = '<option></option>' + extensions.map(makeOption).join('\n');
+		extensionsSelector.innerHTML = '<option></option>' + extensionOptions.map(makeOption).join('\n');
 
 		this.addEventListener('extension-selector', 'change', (e: Event) => {
 			const selectedExtensionId = (<HTMLInputElement>e.target).value;

From ed3b15acbf622122a0e7ba2dd8c70ee7e4becaab Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 2 Apr 2018 20:31:20 +0200
Subject: [PATCH 255/383] :lipstick:

---
 src/vs/vscode.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 243d44f73e5..7e012115065 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -5259,7 +5259,8 @@ declare module 'vscode' {
 		/**
 		 * Register a [TreeDataProvider](#TreeDataProvider) for the view contributed using the extension point `views`.
 		 * This will allow you to contribute data to the [TreeView](#TreeView) and update if the data changes.
-		 * To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
+		 * 
+		 * **Note:** To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
 		 *
 		 * @param viewId Id of the view contributed using the extension point `views`.
 		 * @param treeDataProvider A [TreeDataProvider](#TreeDataProvider) that provides tree data for the view

From 400769cfaf4e3937082ca5a59b836d22ab80f0d3 Mon Sep 17 00:00:00 2001
From: Kenny Le <kennyle1412@gmail.com>
Date: Sat, 24 Mar 2018 01:04:30 -0500
Subject: [PATCH 256/383] Created Split Terminal (In Active Workspace)

Similar functionality to CreateTerminalInActiveWorkspace for
CreateTerminal for no prompt creation.
---
 .../electron-browser/terminal.contribution.ts |  4 +++-
 .../electron-browser/terminalActions.ts       | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index 4ff8b5479e0..3e01d23f60e 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -18,7 +18,7 @@ import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, ClearSelectionTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, ClearSelectionTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, SplitInActiveWorkspaceTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -275,6 +275,7 @@ configurationRegistry.registerConfiguration({
 				TogglePanelAction.ID,
 				'workbench.action.quickOpenView',
 				SplitTerminalAction.ID,
+				SplitInActiveWorkspaceTerminalAction.ID,
 				FocusPreviousPaneTerminalAction.ID,
 				FocusNextPaneTerminalAction.ID,
 				ResizePaneLeftTerminalAction.ID,
@@ -447,6 +448,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SplitTerminalAct
 		secondary: [KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_5]
 	}
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Split', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SplitInActiveWorkspaceTerminalAction, SplitInActiveWorkspaceTerminalAction.ID, SplitInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Split Terminal (In Active Workspace)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousPaneTerminalAction, FocusPreviousPaneTerminalAction.ID, FocusPreviousPaneTerminalAction.LABEL, {
 	primary: KeyMod.Alt | KeyCode.LeftArrow,
 	secondary: [KeyMod.Alt | KeyCode.UpArrow],
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 9771405d9d3..35976e39694 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -325,6 +325,27 @@ export class SplitTerminalAction extends Action {
 	}
 }
 
+export class SplitInActiveWorkspaceTerminalAction extends Action {
+	public static readonly ID = 'workbench.action.terminal.splitInActiveWorkspace';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.splitInActiveWorkspace', "Split Terminal (In Active Workspace)");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private readonly _terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		const instance = this._terminalService.getActiveInstance();
+		if (!instance) {
+			return TPromise.as(void 0);
+		}
+		this._terminalService.splitInstance(instance);
+		return this._terminalService.showPanel(true);
+	}
+}
+
 export class FocusPreviousPaneTerminalAction extends Action {
 	public static readonly ID = 'workbench.action.terminal.focusPreviousPane';
 	public static readonly LABEL = nls.localize('workbench.action.terminal.focusPreviousPane', "Focus Previous Pane");

From 860073da3f69364ca8f0582a0c210da639678a17 Mon Sep 17 00:00:00 2001
From: Kenny Le <kennyle1412@gmail.com>
Date: Sat, 24 Mar 2018 03:25:03 -0500
Subject: [PATCH 257/383] Split terminal based on workspace. Close #45694.

---
 .../parts/terminal/common/terminal.ts         |  4 +--
 .../electron-browser/terminalActions.ts       | 31 +++++++++++++++++--
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index ac926fbdf81..ed019f21ef7 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -164,7 +164,7 @@ export interface ITerminalService {
 	setActiveInstance(terminalInstance: ITerminalInstance): void;
 	setActiveInstanceByIndex(terminalIndex: number): void;
 	getActiveOrCreateInstance(wasNewTerminalAction?: boolean): ITerminalInstance;
-	splitInstance(instance: ITerminalInstance): void;
+	splitInstance(instance: ITerminalInstance, shell?: IShellLaunchConfig): void;
 
 	getActiveTab(): ITerminalTab;
 	setActiveTabToNext(): void;
@@ -452,4 +452,4 @@ export interface ITerminalCommandTracker {
 	scrollToNextCommand(): void;
 	selectToPreviousCommand(): void;
 	selectToNextCommand(): void;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 35976e39694..671970a7183 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -310,7 +310,9 @@ export class SplitTerminalAction extends Action {
 
 	constructor(
 		id: string, label: string,
-		@ITerminalService private readonly _terminalService: ITerminalService
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@ICommandService private commandService: ICommandService,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService
 	) {
 		super(id, label, 'terminal-action split');
 	}
@@ -320,8 +322,31 @@ export class SplitTerminalAction extends Action {
 		if (!instance) {
 			return TPromise.as(void 0);
 		}
-		this._terminalService.splitInstance(instance);
-		return this._terminalService.showPanel(true);
+
+		const folders = this.workspaceContextService.getWorkspace().folders;
+
+		let pathPromise: TPromise<any> = TPromise.as({});
+		if (folders.length > 1) {
+			// Only choose a path when there's more than 1 folder
+			const options: IPickOptions = {
+				placeHolder: nls.localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal")
+			};
+			pathPromise = this.commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]).then(workspace => {
+				if (!workspace) {
+					// Don't split the instance if the workspace picker was canceled
+					return null;
+				}
+				return TPromise.as({ cwd: workspace.uri.fsPath });
+			});
+		}
+
+		return pathPromise.then(path => {
+			if (!path) {
+				return TPromise.as(void 0);
+			}
+			this._terminalService.splitInstance(instance, path);
+			return this._terminalService.showPanel(true);
+		});
 	}
 }
 

From e53d0cdadd008ba0c2444f0470205559a5e0715d Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 2 Apr 2018 20:53:54 +0200
Subject: [PATCH 258/383] Remove space

---
 src/vs/vscode.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 7e012115065..c841a93202a 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -5259,7 +5259,7 @@ declare module 'vscode' {
 		/**
 		 * Register a [TreeDataProvider](#TreeDataProvider) for the view contributed using the extension point `views`.
 		 * This will allow you to contribute data to the [TreeView](#TreeView) and update if the data changes.
-		 * 
+		 *
 		 * **Note:** To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
 		 *
 		 * @param viewId Id of the view contributed using the extension point `views`.

From 0dd7c793aef9ad23a7065751473b2ccc2acdbadb Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 2 Apr 2018 11:56:32 -0700
Subject: [PATCH 259/383] Fixes js/ts quick fixes

Fixes #47002

Use the correct grouping for the not null assertion
---
 .../src/features/quickFixProvider.ts                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/typescript-language-features/src/features/quickFixProvider.ts b/extensions/typescript-language-features/src/features/quickFixProvider.ts
index 088e9734ba8..d4197bfeabb 100644
--- a/extensions/typescript-language-features/src/features/quickFixProvider.ts
+++ b/extensions/typescript-language-features/src/features/quickFixProvider.ts
@@ -110,7 +110,7 @@ class SupportedCodeActionProvider {
 
 	public async getFixableDiagnosticsForContext(context: vscode.CodeActionContext): Promise<vscode.Diagnostic[]> {
 		const supportedActions = await this.supportedCodeActions;
-		const fixableDiagnostics = DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+!diagnostic.code)));
+		const fixableDiagnostics = DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+(diagnostic.code!))));
 		return Array.from(fixableDiagnostics.values);
 	}
 
@@ -184,7 +184,7 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 	): Promise<Iterable<vscode.CodeAction>> {
 		const args: Proto.CodeFixRequestArgs = {
 			...typeConverters.Range.toFileRangeRequestArgs(file, diagnostic.range),
-			errorCodes: [+!diagnostic.code]
+			errorCodes: [+(diagnostic.code!)]
 		};
 		const codeFixesResponse = await this.client.execute('getCodeFixes', args, token);
 		if (codeFixesResponse.body) {

From f4010646aa2317d70dd473cb317ef536342ce6a2 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 2 Apr 2018 16:08:08 -0700
Subject: [PATCH 260/383] Update markdown grammar

Fixes #46794
---
 extensions/markdown-basics/syntaxes/markdown.tmLanguage.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
index 7d7d9a53914..4209215a5f8 100644
--- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/07f55fa7c0dcdbfeb21b8970255e96dd9c00b6bb",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/6e1063a71d4d017f976ccbe3d68138f4662c9a66",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@@ -1933,7 +1933,7 @@
 					"name": "meta.other.valid-ampersand.markdown"
 				},
 				"bold": {
-					"begin": "(?x)\n (\\*\\*|__)(?=\\S)                # Open\n (?=\n   (\n     <[^>]*+>              # HTML tags\n     | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                       # Raw\n     | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+      # Escapes\n     | \\[\n     (\n         (?<square>          # Named group\n           [^\\[\\]\\\\]        # Match most chars\n           | \\\\.            # Escaped chars\n           | \\[ \\g<square>*+ \\]    # Nested brackets\n         )*+\n       \\]\n       (\n         (              # Reference Link\n           [ ]?          # Optional space\n           \\[[^\\]]*+\\]        # Ref name\n         )\n         | (              # Inline Link\n           \\(            # Opening paren\n             [ \\t]*+        # Optional whitespace\n             <?(.*?)>?      # URL\n             [ \\t]*+        # Optional whitespace\n             (          # Optional Title\n               (?<title>['\"])\n               (.*?)\n               \\k<title>\n             )?\n           \\)\n         )\n       )\n     )\n     | (?!(?<=\\S)\\1).            # Everything besides\n                       # style closer\n   )++\n   (?<=\\S)\\1                # Close\n )\n",
+					"begin": "(?x)\n ((?<!\\w)\\*\\*\\b|\\b__)(?=\\S)                # Open\n (?=\n   (\n     <[^>]*+>              # HTML tags\n     | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                       # Raw\n     | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+      # Escapes\n     | \\[\n     (\n         (?<square>          # Named group\n           [^\\[\\]\\\\]        # Match most chars\n           | \\\\.            # Escaped chars\n           | \\[ \\g<square>*+ \\]    # Nested brackets\n         )*+\n       \\]\n       (\n         (              # Reference Link\n           [ ]?          # Optional space\n           \\[[^\\]]*+\\]        # Ref name\n         )\n         | (              # Inline Link\n           \\(            # Opening paren\n             [ \\t]*+        # Optional whitespace\n             <?(.*?)>?      # URL\n             [ \\t]*+        # Optional whitespace\n             (          # Optional Title\n               (?<title>['\"])\n               (.*?)\n               \\k<title>\n             )?\n           \\)\n         )\n       )\n     )\n     | (?!(?<=\\S)\\1).            # Everything besides\n                       # style closer\n   )++\n   (?<=\\S)\\1                # Close\n )\n",
 					"captures": {
 						"1": {
 							"name": "punctuation.definition.bold.markdown"

From 85d01bfd812c1a99b23d499def98ac14e316c4c8 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 2 Apr 2018 16:08:25 -0700
Subject: [PATCH 261/383] Update js/ts grammars

---
 .../syntaxes/JavaScript.tmLanguage.json       | 32 +++++++++++--------
 .../syntaxes/JavaScriptReact.tmLanguage.json  | 32 +++++++++++--------
 .../syntaxes/TypeScript.tmLanguage.json       | 24 ++++++++------
 .../syntaxes/TypeScriptReact.tmLanguage.json  | 32 +++++++++++--------
 4 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index b697edd0f75..bee53b77de4 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24b8d8d8b7e31fbec7390f3ed4a9831a6a5c4ca1",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -1106,27 +1106,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.js",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.js"
+					"name": "keyword.operator.type.modifier.js"
 				},
 				"2": {
-					"name": "meta.brace.square.js"
+					"name": "storage.modifier.js"
 				},
 				"3": {
-					"name": "entity.name.type.js"
+					"name": "meta.brace.square.js"
 				},
 				"4": {
+					"name": "entity.name.type.js"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.js"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.js"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.js"
+				},
+				"3": {
 					"name": "keyword.operator.optional.js"
 				}
 			},
@@ -2126,13 +2132,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.js",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -4252,8 +4258,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4262,7 +4268,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4289,7 +4295,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js"
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index 485fc113e79..035c6167a75 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24b8d8d8b7e31fbec7390f3ed4a9831a6a5c4ca1",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -1106,27 +1106,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.js.jsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.js.jsx"
+					"name": "keyword.operator.type.modifier.js.jsx"
 				},
 				"2": {
-					"name": "meta.brace.square.js.jsx"
+					"name": "storage.modifier.js.jsx"
 				},
 				"3": {
-					"name": "entity.name.type.js.jsx"
+					"name": "meta.brace.square.js.jsx"
 				},
 				"4": {
+					"name": "entity.name.type.js.jsx"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.js.jsx"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.js.jsx"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.js.jsx"
+				},
+				"3": {
 					"name": "keyword.operator.optional.js.jsx"
 				}
 			},
@@ -2126,13 +2132,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.js.jsx",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -4252,8 +4258,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4262,7 +4268,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js.jsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4289,7 +4295,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js.jsx"
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 723570e8d51..63d19b71264 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24b8d8d8b7e31fbec7390f3ed4a9831a6a5c4ca1",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -1103,27 +1103,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.ts",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.ts"
+					"name": "keyword.operator.type.modifier.ts"
 				},
 				"2": {
-					"name": "meta.brace.square.ts"
+					"name": "storage.modifier.ts"
 				},
 				"3": {
-					"name": "entity.name.type.ts"
+					"name": "meta.brace.square.ts"
 				},
 				"4": {
+					"name": "entity.name.type.ts"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.ts"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.ts"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.ts"
+				},
+				"3": {
 					"name": "keyword.operator.optional.ts"
 				}
 			},
@@ -2123,13 +2129,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.ts",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index a230668f744..d54948c7c93 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24b8d8d8b7e31fbec7390f3ed4a9831a6a5c4ca1",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -1106,27 +1106,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.tsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.tsx"
+					"name": "keyword.operator.type.modifier.tsx"
 				},
 				"2": {
-					"name": "meta.brace.square.tsx"
+					"name": "storage.modifier.tsx"
 				},
 				"3": {
-					"name": "entity.name.type.tsx"
+					"name": "meta.brace.square.tsx"
 				},
 				"4": {
+					"name": "entity.name.type.tsx"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.tsx"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.tsx"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.tsx"
+				},
+				"3": {
 					"name": "keyword.operator.optional.tsx"
 				}
 			},
@@ -2126,13 +2132,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.tsx",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -4252,8 +4258,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4262,7 +4268,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.tsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4289,7 +4295,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.tsx"

From fd182746cb47c60ceddffdf236925334caf06e68 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 2 Apr 2018 16:29:49 -0700
Subject: [PATCH 262/383] Fix can't change markdown security level for directly
 opened file

Fixes #46424
---
 .../src/commands/showPreviewSecuritySelector.ts        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts b/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
index 5b49d7f7c54..2e520415ebc 100644
--- a/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
+++ b/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
@@ -18,13 +18,13 @@ export class ShowPreviewSecuritySelectorCommand implements Command {
 	) { }
 
 	public execute(resource: string | undefined) {
-		if (resource) {
-			const source = vscode.Uri.parse(resource).query;
-			this.previewSecuritySelector.showSecutitySelectorForResource(vscode.Uri.parse(source));
+		if (this.previewManager.activePreviewResource) {
+			this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);
+		} else if (resource) {
+			const source = vscode.Uri.parse(resource);
+			this.previewSecuritySelector.showSecutitySelectorForResource(source.query ? vscode.Uri.parse(source.query) : source);
 		} else if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {
 			this.previewSecuritySelector.showSecutitySelectorForResource(vscode.window.activeTextEditor.document.uri);
-		} else if (this.previewManager.activePreviewResource) {
-			this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);
 		}
 	}
 }
\ No newline at end of file

From 5900899b83fef06eeef75161518f13563acb6439 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 2 Apr 2018 18:43:28 -0700
Subject: [PATCH 263/383] Fix quick suggestions not shown in `${|` template
 string

Fixes #37176
---
 extensions/javascript/package.json        | 6 ++----
 extensions/typescript-basics/package.json | 6 ++----
 package.json                              | 2 +-
 yarn.lock                                 | 6 +++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json
index e38054a4a80..066091d7c84 100644
--- a/extensions/javascript/package.json
+++ b/extensions/javascript/package.json
@@ -61,8 +61,7 @@
         },
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.js": "other",
-          "entity.name.function.tagged-template.js.jsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       },
@@ -78,8 +77,7 @@
         },
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.js": "other",
-          "entity.name.function.tagged-template.js.jsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       },
diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json
index 691ad1631b6..870b3e7fa81 100644
--- a/extensions/typescript-basics/package.json
+++ b/extensions/typescript-basics/package.json
@@ -45,8 +45,7 @@
         "path": "./syntaxes/TypeScript.tmLanguage.json",
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.ts": "other",
-          "entity.name.function.tagged-template.tsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       },
@@ -62,8 +61,7 @@
         },
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.ts": "other",
-          "entity.name.function.tagged-template.tsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       }
diff --git a/package.json b/package.json
index 7881dab829e..e6b4adac823 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "vscode-debugprotocol": "1.28.0",
     "vscode-nsfw": "1.0.17",
     "vscode-ripgrep": "^0.8.1",
-    "vscode-textmate": "^3.3.2",
+    "vscode-textmate": "^3.3.3",
     "vscode-xterm": "3.3.0-beta8",
     "yauzl": "2.8.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 10fac872582..24ab3f1d6fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5920,9 +5920,9 @@ vscode-ripgrep@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-0.8.1.tgz#861d2ac97a3764e9f40f305620423efc50632ad1"
 
-vscode-textmate@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-3.3.2.tgz#43d7722d24ed168d195a1e3c582c6914917a37ab"
+vscode-textmate@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-3.3.3.tgz#8d737f2965046503a4088d47c2793aebe246d355"
   dependencies:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"

From 268ec647b7e6c280b474d0da5e51049269000944 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 3 Apr 2018 09:57:04 +0200
Subject: [PATCH 264/383] don't read null range, #46893

---
 src/vs/editor/contrib/zoneWidget/zoneWidget.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/zoneWidget/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/zoneWidget.ts
index ed08e1974ed..784aac39e55 100644
--- a/src/vs/editor/contrib/zoneWidget/zoneWidget.ts
+++ b/src/vs/editor/contrib/zoneWidget/zoneWidget.ts
@@ -210,6 +210,7 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 		}
 
 		this.editor.deltaDecorations(this._positionMarkerId, []);
+		this._positionMarkerId = [];
 	}
 
 	public create(): void {
@@ -280,10 +281,14 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 
 	public get position(): Position {
 		const [id] = this._positionMarkerId;
-		if (id) {
-			return this.editor.getModel().getDecorationRange(id).getStartPosition();
+		if (!id) {
+			return undefined;
 		}
-		return undefined;
+		const range = this.editor.getModel().getDecorationRange(id);
+		if (!range) {
+			return undefined;
+		}
+		return range.getStartPosition();
 	}
 
 	protected _isShowing: boolean = false;

From 8cdda963936021ec34a882bcc45b0df98268b84b Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 3 Apr 2018 11:16:46 +0200
Subject: [PATCH 265/383] Use existing button widget (fixes #46947)

---
 .../browser/parts/quickinput/quickInput.css   |  9 +++----
 .../browser/parts/quickinput/quickInput.ts    | 27 ++++++-------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index a4d68e602b7..28ec8b5c3dd 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -45,13 +45,12 @@
 
 .quick-input-action {
 	margin-left: 6px;
-	border: 0;
-	padding: 6px;
-	cursor: pointer;
 }
 
-.quick-input-action:focus {
-	outline:0;
+.quick-input-action .monaco-text-button {
+	font-size: 85%;
+	padding: 7px 6px 6px 6px;
+	line-height: initial;
 }
 
 .quick-input-progress.monaco-progress-container,
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 23478edf3fe..b65d9de2ee1 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -13,7 +13,7 @@ import { Dimension } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
-import { buttonBackground, buttonForeground, contrastBorder, buttonHoverBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
 import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -26,10 +26,11 @@ import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { attachBadgeStyler, attachProgressBarStyler } from 'vs/platform/theme/common/styler';
+import { attachBadgeStyler, attachProgressBarStyler, attachButtonStyler } from 'vs/platform/theme/common/styler';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { chain } from 'vs/base/common/event';
+import { Button } from 'vs/base/browser/ui/button/button';
 
 const $ = dom.$;
 
@@ -113,9 +114,11 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.count = new CountBadge(badgeContainer, { countFormat: localize('quickInput.countSelected', "{0} Selected") });
 		this.toUnbind.push(attachBadgeStyler(this.count, this.themeService));
 
-		const ok = dom.append(headerContainer, $('button.quick-input-action'));
-		ok.textContent = localize('ok', "OK");
-		this.toUnbind.push(dom.addDisposableListener(ok, dom.EventType.CLICK, e => {
+		const okContainer = dom.append(headerContainer, $('.quick-input-action'));
+		const ok = new Button(okContainer);
+		attachButtonStyler(ok, this.themeService);
+		ok.label = localize('ok', "OK");
+		this.toUnbind.push(ok.onDidClick(e => {
 			if (this.ready) {
 				this.close(this.checkboxList.getCheckedElements());
 			}
@@ -293,18 +296,4 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 		${contrastBorderColor ? `border: 1px solid ${contrastBorderColor};` : ''}
 		${widgetShadowColor ? `box-shadow: 0 5px 8px ${widgetShadowColor};` : ''}
 	}`);
-
-	const buttonBackgroundColor = theme.getColor(buttonBackground);
-	const buttonForegroundColor = theme.getColor(buttonForeground);
-	collector.addRule(`.quick-input-action {
-		${buttonBackgroundColor ? `background-color: ${buttonBackgroundColor};` : ''}
-		${buttonForegroundColor ? `color: ${buttonForegroundColor};` : ''}
-		${contrastBorderColor ? `border: 1px solid ${contrastBorderColor};` : ''}
-	}`);
-
-	const buttonHoverBackgroundColor = theme.getColor(buttonHoverBackground);
-	if (buttonHoverBackgroundColor) {
-		collector.addRule(`.quick-input-action:hover { background-color: ${buttonHoverBackgroundColor}; }`);
-		collector.addRule(`.quick-input-action:focus { background-color: ${buttonHoverBackgroundColor}; }`);
-	}
 });

From dfb1b754522cf82d332a2acc1043c644717d55c3 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 3 Apr 2018 11:23:14 +0200
Subject: [PATCH 266/383] always clean repos before building

---
 build/tfs/product-build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index f0e6f2811a3..dfea67f70ab 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -9,6 +9,8 @@ phases:
         VSCODE_ARCH: x64
       ia32:
         VSCODE_ARCH: ia32
+  resources:
+    - clean: true
 
   steps:
   - task: NodeTool@0
@@ -225,6 +227,8 @@ phases:
 - phase: Linux
   condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
   queue: linux-x64
+  resources:
+    - clean: true
   variables:
     VSCODE_ARCH: x64
 
@@ -272,6 +276,8 @@ phases:
 - phase: Linux32
   condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
   queue: linux-ia32
+  resources:
+    - clean: true
   variables:
     VSCODE_ARCH: ia32
 
@@ -319,6 +325,8 @@ phases:
 - phase: macOS
   condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
   queue: Hosted macOS Preview
+  resources:
+    - clean: true
   steps:
   - task: NodeTool@0
     inputs:

From cc514efa17735271e2406bbc6475617702c459b8 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 3 Apr 2018 11:26:04 +0200
Subject: [PATCH 267/383] Revert "always clean repos before building"

This reverts commit dfb1b754522cf82d332a2acc1043c644717d55c3.
---
 build/tfs/product-build.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index dfea67f70ab..f0e6f2811a3 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -9,8 +9,6 @@ phases:
         VSCODE_ARCH: x64
       ia32:
         VSCODE_ARCH: ia32
-  resources:
-    - clean: true
 
   steps:
   - task: NodeTool@0
@@ -227,8 +225,6 @@ phases:
 - phase: Linux
   condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
   queue: linux-x64
-  resources:
-    - clean: true
   variables:
     VSCODE_ARCH: x64
 
@@ -276,8 +272,6 @@ phases:
 - phase: Linux32
   condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
   queue: linux-ia32
-  resources:
-    - clean: true
   variables:
     VSCODE_ARCH: ia32
 
@@ -325,8 +319,6 @@ phases:
 - phase: macOS
   condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
   queue: Hosted macOS Preview
-  resources:
-    - clean: true
   steps:
   - task: NodeTool@0
     inputs:

From 70ea06a46fd4b38bdba9ab1d64f3fee0f63806a5 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 3 Apr 2018 11:43:02 +0200
Subject: [PATCH 268/383] fix #46971

---
 .../contrib/referenceSearch/referencesWidget.ts      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index edf3327d480..125595fb249 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -658,7 +658,7 @@ export class ReferenceWidget extends PeekViewWidget {
 			var onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
 				if (element instanceof OneReference) {
 					if (kind === 'show') {
-						this._revealReference(element);
+						this._revealReference(element, false);
 					}
 					this._onDidSelectReference.fire({ element, kind, source: 'tree' });
 				}
@@ -710,7 +710,7 @@ export class ReferenceWidget extends PeekViewWidget {
 	}
 
 	public setSelection(selection: OneReference): TPromise<any> {
-		return this._revealReference(selection).then(() => {
+		return this._revealReference(selection, true).then(() => {
 
 			// show in tree
 			this._tree.setSelection([selection]);
@@ -780,7 +780,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		return undefined;
 	}
 
-	private _revealReference(reference: OneReference): TPromise<void> {
+	private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
 
 		// Update widget header
 		if (reference.uri.scheme !== Schemas.inMemory) {
@@ -791,7 +791,11 @@ export class ReferenceWidget extends PeekViewWidget {
 
 		const promise = this._textModelResolverService.createModelReference(reference.uri);
 
-		return TPromise.join([promise, this._tree.reveal(reference, 1)]).then(values => {
+		if (revealParent) {
+			await this._tree.reveal(reference.parent);
+		}
+
+		return TPromise.join([promise, this._tree.reveal(reference)]).then(values => {
 			const ref = values[0];
 
 			if (!this._model) {

From 644f5d5d167ec7107d512924056ec5b39bc89389 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 3 Apr 2018 11:55:50 +0200
Subject: [PATCH 269/383] Avoid global CSS rules (fixes #469460)

---
 .../browser/parts/quickinput/quickInput.ts    | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index b65d9de2ee1..daac7a7795d 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -12,7 +12,7 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { Dimension } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
 import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
@@ -93,7 +93,6 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.inputBox = new QuickInputBox(filterContainer);
 		this.toUnbind.push(this.inputBox);
-		this.inputBox.style(this.themeService.getTheme());
 		this.inputBox.onDidChange(value => {
 			this.checkboxList.filter(value);
 		});
@@ -194,6 +193,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 		}));
 
 		this.toUnbind.push(this.quickOpenService.onShow(() => this.close()));
+
+		this.updateStyles();
 	}
 
 	private close(value?: IPickOpenEntry[] | Thenable<IPickOpenEntry[]>) {
@@ -279,21 +280,19 @@ export class QuickInputService extends Component implements IQuickInputService {
 	}
 
 	protected updateStyles() {
+		const theme = this.themeService.getTheme();
 		if (this.inputBox) {
-			this.inputBox.style(this.themeService.getTheme());
+			this.inputBox.style(theme);
+		}
+		if (this.container) {
+			const sideBarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
+			this.container.style.backgroundColor = sideBarBackground ? sideBarBackground.toString() : undefined;
+			const sideBarForeground = theme.getColor(SIDE_BAR_FOREGROUND);
+			this.container.style.color = sideBarForeground ? sideBarForeground.toString() : undefined;
+			const contrastBorderColor = theme.getColor(contrastBorder);
+			this.container.style.border = contrastBorderColor ? `1px solid ${contrastBorderColor}` : undefined;
+			const widgetShadowColor = theme.getColor(widgetShadow);
+			this.container.style.boxShadow = widgetShadowColor ? `0 5px 8px ${widgetShadowColor}` : undefined;
 		}
 	}
 }
-
-registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
-	const sideBarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
-	const sideBarForeground = theme.getColor(SIDE_BAR_FOREGROUND);
-	const contrastBorderColor = theme.getColor(contrastBorder);
-	const widgetShadowColor = theme.getColor(widgetShadow);
-	collector.addRule(`.quick-input-widget {
-		${sideBarBackground ? `background-color: ${sideBarBackground};` : ''}
-		${sideBarForeground ? `color: ${sideBarForeground};` : ''}
-		${contrastBorderColor ? `border: 1px solid ${contrastBorderColor};` : ''}
-		${widgetShadowColor ? `box-shadow: 0 5px 8px ${widgetShadowColor};` : ''}
-	}`);
-});

From 4bb262df0c1ce0b87fbd12469282d5fc6998eeca Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 3 Apr 2018 11:57:59 +0200
Subject: [PATCH 270/383] [powershell] invalid auto-closing pairs in
 language-configuration.json. Fixes  #46988

---
 extensions/powershell/language-configuration.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/powershell/language-configuration.json b/extensions/powershell/language-configuration.json
index 29445c790a3..02e7a9ddec4 100644
--- a/extensions/powershell/language-configuration.json
+++ b/extensions/powershell/language-configuration.json
@@ -14,7 +14,6 @@
 		["(", ")"],
 		{ "open": "\"", "close": "\"", "notIn": ["string"]},
 		{ "open": "'", "close": "'", "notIn": ["string", "comment"]},
-		["/**", " */"],
 		["<#", "#>"]
 	],
 	"surroundingPairs": [

From ef55294a208f37f8671a9876ce64926adf297419 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 3 Apr 2018 11:58:05 +0200
Subject: [PATCH 271/383] fix #44305

---
 src/vs/editor/contrib/suggest/suggestMemory.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts
index 6351ea04471..5256dd4bce4 100644
--- a/src/vs/editor/contrib/suggest/suggestMemory.ts
+++ b/src/vs/editor/contrib/suggest/suggestMemory.ts
@@ -58,7 +58,7 @@ export class LRUMemory extends Memory {
 		this._cache.set(key, {
 			touch: this._seq++,
 			type: item.suggestion.type,
-			insertText: undefined
+			insertText: item.suggestion.insertText
 		});
 	}
 
@@ -74,7 +74,7 @@ export class LRUMemory extends Memory {
 				const { suggestion } = items[i];
 				const key = `${model.getLanguageIdentifier().language}/${suggestion.label}`;
 				const item = this._cache.get(key);
-				if (item && item.touch > seq && item.type === suggestion.type) {
+				if (item && item.touch > seq && item.type === suggestion.type && item.insertText === suggestion.insertText) {
 					seq = item.touch;
 					res = i;
 				}

From 88603b377d56ead7b5c4cfc6bc3a64e5f832cd60 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Tue, 3 Apr 2018 03:39:25 -0700
Subject: [PATCH 272/383] Update to Electron v2.0.0-beta.6 (#46552)

* electron@2.0.0-beta-1

* Update distro

* Update electron.d.ts to 2.0.0-beta.1

* Disable asar as it causes a native crash

* Adopt Module._resolveLookupPaths ASAR patch

* electron 2.x - restore inspector URL in extension host

* electron 2.x - adopt context menu callback for onHide

* electron 2.x - remove workaround for https://github.com/electron/electron/issues/10442

* electron 2.x - update node.d.ts

* electron 2.x - update node.d.ts to 8.9.x

* electron 2.x - keep node.d.ts changes to a minimum

* electron 2.x - remove workaround for https://github.com/electron/electron/issues/10862

* electron 2.x - bump to 2.0.0-beta2

* bump to 2.0.0-beta.3

* Context menu: selecting "Rename" does not put focs into rename box (fix #45601)

* quality "exploration" for easier testing

* empty commit

* push a workaround for #45700

* Certain themes show UI artifacts over activity bar icons (fixes #45700)

* better fix for #45700

* bump to 2.0.0-beta.4

* another fix to prevent flickering for #45700

* avoid remote access in index.js

* bump distro commit

* electron 2.x - do not use --debug anymore

* bump electron to 2.0.0-beta.5

* electron 2.x - add libgtk-3-dev as build dependency for Linux 64

* electron 2.x - workaround freeze on linux on startup

* bump local storage telemetry key

* electron 2.x - do a one time backup of local storage

* enable ELECTRON_ENABLE_LOGGING on macOS at least

* 2.0.0-beta.6

* Fix ctrl+shift+e not focusing explorer on Linux

* distro - use GH electron builds for now
---
 .yarnrc                                       |    2 +-
 package.json                                  |    2 +-
 scripts/code-cli.bat                          |    2 +-
 scripts/code-cli.sh                           |    2 +-
 scripts/code.sh                               |    5 +-
 scripts/test.sh                               |    5 +-
 src/main.js                                   |    1 -
 src/typings/electron.d.ts                     | 1213 ++-
 src/typings/node.d.ts                         | 9478 +++++++++++------
 src/vs/base/node/processes.ts                 |    2 +-
 src/vs/base/node/request.ts                   |    2 +-
 src/vs/base/test/common/arrays.test.ts        |    2 +-
 src/vs/base/test/common/cache.test.ts         |    8 +-
 .../base/test/node/processes/fixtures/fork.ts |    2 +-
 .../node/processes/fixtures/fork_large.ts     |    2 +-
 src/vs/code/electron-main/app.ts              |   93 +-
 src/vs/code/electron-main/main.ts             |    7 +
 src/vs/code/electron-main/menus.ts            |    2 +-
 src/vs/code/electron-main/window.ts           |   24 +-
 src/vs/code/electron-main/windows.ts          |    2 +-
 .../editor/contrib/rename/renameInputField.ts |    2 +-
 src/vs/editor/test/common/model/model.test.ts |   14 +-
 .../electron-main/updateService.darwin.ts     |    2 +-
 .../url/electron-main/electronUrlListener.ts  |    2 +-
 .../parts/activitybar/activitybarPart.ts      |   34 +-
 .../electron-browser/bootstrap/index.js       |    2 +-
 src/vs/workbench/electron-browser/shell.ts    |    8 +-
 src/vs/workbench/electron-browser/window.ts   |   14 +-
 src/vs/workbench/node/extensionHostMain.ts    |    4 +-
 .../parts/cache/node/nodeCachedDataManager.ts |    4 +-
 .../debug/test/node/debugAdapter.test.ts      |    2 +-
 .../parts/terminal/node/terminalProcess.ts    |    6 +-
 .../electron-browser/contextmenuService.ts    |   34 +-
 .../electron-browser/crashReporterService.ts  |    2 +-
 .../electron-browser/extensionHost.ts         |   10 +-
 .../node/watcher/nsfw/nsfwWatcherService.ts   |    2 +-
 .../services/search/node/ripgrepTextSearch.ts |    2 +-
 .../search/test/node/searchService.test.ts    |   14 +-
 38 files changed, 7267 insertions(+), 3747 deletions(-)

diff --git a/.yarnrc b/.yarnrc
index 42f08fa0c02..d725d462bab 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "1.7.12"
+target "2.0.0-beta.6"
 runtime "electron"
diff --git a/package.json b/package.json
index e6b4adac823..988568c52ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.23.0",
-  "distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
+  "distro": "6834b79a655ade3dce6df4799a264ff29bff6652",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/scripts/code-cli.bat b/scripts/code-cli.bat
index f08ddb744e0..7bca260314d 100644
--- a/scripts/code-cli.bat
+++ b/scripts/code-cli.bat
@@ -29,7 +29,7 @@ set ELECTRON_ENABLE_LOGGING=1
 set ELECTRON_ENABLE_STACK_DUMPING=1
 
 :: Launch Code
-%CODE% --debug=5874 out\cli.js . %*
+%CODE% --inspect=5874 out\cli.js . %*
 popd
 
 endlocal
diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
index 89e518322fc..ba2121d9bb9 100755
--- a/scripts/code-cli.sh
+++ b/scripts/code-cli.sh
@@ -32,7 +32,7 @@ function code() {
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \
 	ELECTRON_ENABLE_STACK_DUMPING=1 \
-	"$CODE" --debug=5874 "$ROOT/out/cli.js" . "$@"
+	"$CODE" --inspect=5874 "$ROOT/out/cli.js" . "$@"
 }
 
 code "$@"
diff --git a/scripts/code.sh b/scripts/code.sh
index f6d103ceda5..26332faea6c 100755
--- a/scripts/code.sh
+++ b/scripts/code.sh
@@ -3,6 +3,10 @@
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname "$(dirname "$(realpath "$0")")")
+
+	# On Linux with Electron 2.0.x running out of a VM causes
+	# a freeze so we only enable this flag on macOS
+	export ELECTRON_ENABLE_LOGGING=1
 else
 	ROOT=$(dirname "$(dirname "$(readlink -f $0)")")
 fi
@@ -40,7 +44,6 @@ function code() {
 	export NODE_ENV=development
 	export VSCODE_DEV=1
 	export VSCODE_CLI=1
-	export ELECTRON_ENABLE_LOGGING=1
 	export ELECTRON_ENABLE_STACK_DUMPING=1
 
 	# Launch Code
diff --git a/scripts/test.sh b/scripts/test.sh
index d88a28c5e2d..ac96627846f 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -4,6 +4,10 @@
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname $(dirname $(realpath "$0")))
+
+	# On Linux with Electron 2.0.x running out of a VM causes
+	# a freeze so we only enable this flag on macOS
+	export ELECTRON_ENABLE_LOGGING=1
 else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
 fi
@@ -25,7 +29,6 @@ test -d node_modules || yarn
 node build/lib/electron.js || ./node_modules/.bin/gulp electron
 
 # Unit Tests
-export ELECTRON_ENABLE_LOGGING=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \
diff --git a/src/main.js b/src/main.js
index 84af1506598..1dcd38660cd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -448,7 +448,6 @@ global.getOpenUrls = function () {
 	return openUrls;
 };
 
-
 // use '<UserData>/CachedData'-directory to store
 // node/v8 cached data.
 let nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {
diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts
index ce604fb1bf0..a051aced93b 100644
--- a/src/typings/electron.d.ts
+++ b/src/typings/electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron 1.7.9
+// Type definitions for Electron 2.0.0-beta.2
 // Project: http://electron.atom.io/
 // Definitions by: The Electron Team <https://github.com/electron/electron>
 // Definitions: https://github.com/electron/electron-typescript-definitions
@@ -58,6 +58,7 @@ declare namespace Electron {
 		dialog: Dialog;
 		DownloadItem: typeof DownloadItem;
 		globalShortcut: GlobalShortcut;
+		inAppPurchase: InAppPurchase;
 		IncomingMessage: typeof IncomingMessage;
 		ipcMain: IpcMain;
 		Menu: typeof Menu;
@@ -94,6 +95,7 @@ declare namespace Electron {
 	const desktopCapturer: DesktopCapturer;
 	const dialog: Dialog;
 	const globalShortcut: GlobalShortcut;
+	const inAppPurchase: InAppPurchase;
 	const ipcMain: IpcMain;
 	const ipcRenderer: IpcRenderer;
 	type nativeImage = NativeImage;
@@ -157,6 +159,46 @@ declare namespace Electron {
 			hasVisibleWindows: boolean) => void): this;
 		removeListener(event: 'activate', listener: (event: Event,
 			hasVisibleWindows: boolean) => void): this;
+		/**
+		 * Emitted during Handoff after an activity from this device was successfully
+		 * resumed on another one.
+		 */
+		on(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		once(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		addListener(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		removeListener(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
 		/**
 		 * Emitted before the application starts closing its windows. Calling
 		 * event.preventDefault() will prevent the default behaviour, which is terminating
@@ -286,6 +328,46 @@ declare namespace Electron {
 			 * Contains app-specific state stored by the activity on another device.
 			 */
 			userInfo: any) => void): this;
+		/**
+		 * Emitted during Handoff when an activity from a different device fails to be
+		 * resumed.
+		 */
+		on(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
+		once(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
+		addListener(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
+		removeListener(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
 		/**
 		 * Emitted when the gpu process crashes or is killed.
 		 */
@@ -410,6 +492,49 @@ declare namespace Electron {
 			url: string,
 			certificateList: Certificate[],
 			callback: (certificate?: Certificate) => void) => void): this;
+		/**
+		 * Emitted when Handoff is about to be resumed on another device. If you need to
+		 * update the state to be transferred, you should call event.preventDefault()
+		 * immediately, construct a new userInfo dictionary and call
+		 * app.updateCurrentActiviy() in a timely manner. Otherwise the operation will fail
+		 * and continue-activity-error will be called.
+		 */
+		on(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		once(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		addListener(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		removeListener(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
 		/**
 		 * Emitted when a new webContents is created.
 		 */
@@ -421,6 +546,31 @@ declare namespace Electron {
 			webContents: WebContents) => void): this;
 		removeListener(event: 'web-contents-created', listener: (event: Event,
 			webContents: WebContents) => void): this;
+		/**
+		 * Emitted during Handoff before an activity from a different device wants to be
+		 * resumed. You should call event.preventDefault() if you want to handle this
+		 * event.
+		 */
+		on(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
+		once(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
+		addListener(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
+		removeListener(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
 		/**
 		 * Emitted when the application has finished basic startup. On Windows and Linux,
 		 * the will-finish-launching event is the same as the ready event; on macOS, this
@@ -482,7 +632,7 @@ declare namespace Electron {
 		 */
 		enableMixedSandbox(): void;
 		/**
-		 * Exits immediately with exitCode.  exitCode defaults to 0. All windows will be
+		 * Exits immediately with exitCode. exitCode defaults to 0. All windows will be
 		 * closed immediately without asking user and the before-quit and will-quit events
 		 * will not be emitted.
 		 */
@@ -492,7 +642,6 @@ declare namespace Electron {
 		 * the active app. On Windows, focuses on the application's first window.
 		 */
 		focus(): void;
-		getAppMemoryInfo(): ProcessMetric[];
 		getAppMetrics(): ProcessMetric[];
 		getAppPath(): string;
 		getBadgeCount(): number;
@@ -501,13 +650,13 @@ declare namespace Electron {
 		 * Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
 		 * and macOS, icons depend on the application associated with file mime type.
 		 */
-		getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
+		getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
 		/**
 		 * Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
 		 * and macOS, icons depend on the application associated with file mime type.
 		 */
-		getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
-		getGpuFeatureStatus(): GPUFeatureStatus;
+		getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
+		getGPUFeatureStatus(): GPUFeatureStatus;
 		getJumpListSettings(): JumpListSettings;
 		/**
 		 * Note: When distributing your packaged app, you have to also ship the locales
@@ -517,8 +666,7 @@ declare namespace Electron {
 		getLocale(): string;
 		/**
 		 * If you provided path and args options to app.setLoginItemSettings then you need
-		 * to pass the same arguments here for openAtLogin to be set correctly. Note: This
-		 * API has no effect on MAS builds.
+		 * to pass the same arguments here for openAtLogin to be set correctly.
 		 */
 		getLoginItemSettings(options?: LoginItemSettingsOptions): LoginItemSettings;
 		/**
@@ -544,6 +692,10 @@ declare namespace Electron {
 		 * net_error_list.
 		 */
 		importCertificate(options: ImportCertificateOptions, callback: (result: number) => void): void;
+		/**
+		 * Invalidates the current Handoff user activity.
+		 */
+		invalidateCurrentActivity(type: string): void;
 		isAccessibilitySupportEnabled(): boolean;
 		/**
 		 * This method checks if the current executable is the default handler for a
@@ -555,6 +707,7 @@ declare namespace Electron {
 		 * the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.
 		 */
 		isDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
+		isInApplicationsFolder(): boolean;
 		isReady(): boolean;
 		isUnityRunning(): boolean;
 		/**
@@ -578,6 +731,15 @@ declare namespace Electron {
 		 * instance starts:
 		 */
 		makeSingleInstance(callback: (argv: string[], workingDirectory: string) => void): boolean;
+		/**
+		 * No confirmation dialog will be presented by default, if you wish to allow the
+		 * user to confirm the operation you may do so using the dialog API. NOTE: This
+		 * method throws errors if anything other than the user causes the move to fail.
+		 * For instance if the user cancels the authorization dialog this method returns
+		 * false. If we fail to perform the copy then this method will throw an error. The
+		 * message in the error should be informative and tell you exactly what went wrong
+		 */
+		moveToApplicationsFolder(): boolean;
 		/**
 		 * Try to close all windows. The before-quit event will be emitted first. If all
 		 * windows are successfully closed, the will-quit event will be emitted and by
@@ -615,6 +777,15 @@ declare namespace Electron {
 		 * .plist file. See the Apple docs for more details.
 		 */
 		setAboutPanelOptions(options: AboutPanelOptionsOptions): void;
+		/**
+		 * Manually enables Chrome's accessibility support, allowing to expose
+		 * accessibility switch to users in application settings.
+		 * https://www.chromium.org/developers/design-documents/accessibility for more
+		 * details. Disabled by default. Note: Rendering accessibility tree can
+		 * significantly affect the performance of your app. It should not be enabled by
+		 * default.
+		 */
+		setAccessibilitySupportEnabled(enabled: boolean): void;
 		/**
 		 * Changes the Application User Model ID to id.
 		 */
@@ -660,8 +831,7 @@ declare namespace Electron {
 		/**
 		 * Set the app's login item settings. To work with Electron's autoUpdater on
 		 * Windows, which uses Squirrel, you'll want to set the launch path to Update.exe,
-		 * and pass arguments that specify your application name. For example: Note: This
-		 * API has no effect on MAS builds.
+		 * and pass arguments that specify your application name. For example:
 		 */
 		setLoginItemSettings(settings: Settings): void;
 		/**
@@ -694,6 +864,18 @@ declare namespace Electron {
 		 * them.
 		 */
 		show(): void;
+		/**
+		 * Start accessing a security scoped resource. With this method electron
+		 * applications that are packaged for the Mac App Store may reach outside their
+		 * sandbox to access files chosen by the user. See Apple's documentation for a
+		 * description of how this system works.
+		 */
+		startAccessingSecurityScopedResource(bookmarkData: string): Function;
+		/**
+		 * Updates the current activity if its type matches type, merging the entries from
+		 * userInfo into its current userInfo dictionary.
+		 */
+		updateCurrentActivity(type: string, userInfo: any): void;
 		commandLine: CommandLine;
 		dock: Dock;
 	}
@@ -763,16 +945,18 @@ declare namespace Electron {
 		getFeedURL(): string;
 		/**
 		 * Restarts the app and installs the update after it has been downloaded. It should
-		 * only be called after update-downloaded has been emitted. Note:
-		 * autoUpdater.quitAndInstall() will close all application windows first and only
-		 * emit before-quit event on app after that. This is different from the normal quit
-		 * event sequence.
+		 * only be called after update-downloaded has been emitted. Under the hood calling
+		 * autoUpdater.quitAndInstall() will close all application windows first, and
+		 * automatically call app.quit() after all windows have been closed. Note: If the
+		 * application is quit without calling this API after the update-downloaded event
+		 * has been emitted, the application will still be replaced by the updated one on
+		 * the next run.
 		 */
 		quitAndInstall(): void;
 		/**
 		 * Sets the url and initialize the auto updater.
 		 */
-		setFeedURL(url: string, requestHeaders?: any): void;
+		setFeedURL(options: FeedURLOptions): void;
 	}
 
 	interface BluetoothDevice {
@@ -789,6 +973,8 @@ declare namespace Electron {
 
 		constructor(options?: BrowserViewConstructorOptions);
 		static fromId(id: number): BrowserView;
+		static fromWebContents(webContents: WebContents): BrowserView | null;
+		static getAllViews(): BrowserView[];
 		setAutoResize(options: AutoResizeOptions): void;
 		setBackgroundColor(color: string): void;
 		/**
@@ -831,7 +1017,11 @@ declare namespace Electron {
 		 * cancel the close. Usually you would want to use the beforeunload handler to
 		 * decide whether the window should be closed, which will also be called when the
 		 * window is reloaded. In Electron, returning any value other than undefined would
-		 * cancel the close. For example:
+		 * cancel the close. For example: Note: There is a subtle difference between the
+		 * behaviors of window.onbeforeunload = handler and
+		 * window.addEventListener('beforeunload', handler). It is recommended to always
+		 * set the event.returnValue explicitly, instead of just returning a value, as the
+		 * former works more consistently within Electron.
 		 */
 		on(event: 'close', listener: (event: Event) => void): this;
 		once(event: 'close', listener: (event: Event) => void): this;
@@ -1056,6 +1246,7 @@ declare namespace Electron {
 		 * This API cannot be called before the ready event of the app module is emitted.
 		 */
 		static addExtension(path: string): void;
+		static fromBrowserView(browserView: BrowserView): BrowserWindow | null;
 		static fromId(id: number): BrowserWindow;
 		static fromWebContents(webContents: WebContents): BrowserWindow;
 		static getAllWindows(): BrowserWindow[];
@@ -1080,6 +1271,10 @@ declare namespace Electron {
 		 * ready event of the app module is emitted.
 		 */
 		static removeExtension(name: string): void;
+		/**
+		 * Adds a window as a tab on this window, after the tab for the window instance.
+		 */
+		addTabbedWindow(browserWindow: BrowserWindow): void;
 		/**
 		 * Removes focus from the window.
 		 */
@@ -1123,6 +1318,11 @@ declare namespace Electron {
 		focus(): void;
 		focusOnWebView(): void;
 		getBounds(): Rectangle;
+		/**
+		 * Note: The BrowserView API is currently experimental and may change or be removed
+		 * in future Electron releases.
+		 */
+		getBrowserView(): BrowserView | null;
 		getChildWindows(): BrowserWindow[];
 		getContentBounds(): Rectangle;
 		getContentSize(): number[];
@@ -1133,6 +1333,7 @@ declare namespace Electron {
 		 * (unsigned long) on Linux.
 		 */
 		getNativeWindowHandle(): Buffer;
+		getOpacity(): number;
 		getParentWindow(): BrowserWindow;
 		getPosition(): number[];
 		getRepresentedFilename(): string;
@@ -1184,12 +1385,18 @@ declare namespace Electron {
 		 */
 		isMovable(): boolean;
 		isResizable(): boolean;
+		isSimpleFullScreen(): boolean;
 		isVisible(): boolean;
 		/**
 		 * Note: This API always returns false on Windows.
 		 */
 		isVisibleOnAllWorkspaces(): boolean;
 		isWindowMessageHooked(message: number): boolean;
+		/**
+		 * Same as webContents.loadFile, filePath should be a path to an HTML file relative
+		 * to the root of your application.  See the webContents docs for more information.
+		 */
+		loadFile(filePath: string): void;
 		/**
 		 * Same as webContents.loadURL(url[, options]). The url can be a remote address
 		 * (e.g. http://) or a path to a local HTML file using the file:// protocol. To
@@ -1203,11 +1410,21 @@ declare namespace Electron {
 		 * being displayed already.
 		 */
 		maximize(): void;
+		/**
+		 * Merges all windows into one window with multiple tabs when native tabs are
+		 * enabled and there is more than one open window.
+		 */
+		mergeAllWindows(): void;
 		/**
 		 * Minimizes the window. On some platforms the minimized window will be shown in
 		 * the Dock.
 		 */
 		minimize(): void;
+		/**
+		 * Moves the current tab into a new window if native tabs are enabled and there is
+		 * more than one tab in the current window.
+		 */
+		moveTabToNewWindow(): void;
 		/**
 		 * Uses Quick Look to preview a file at a given path.
 		 */
@@ -1220,6 +1437,16 @@ declare namespace Electron {
 		 * Restores the window from minimized state to its previous state.
 		 */
 		restore(): void;
+		/**
+		 * Selects the next tab when native tabs are enabled and there are other tabs in
+		 * the window.
+		 */
+		selectNextTab(): void;
+		/**
+		 * Selects the previous tab when native tabs are enabled and there are other tabs
+		 * in the window.
+		 */
+		selectPreviousTab(): void;
 		/**
 		 * Sets whether the window should show always on top of other windows. After
 		 * setting this, the window is still a normal window, not a toolbox window which
@@ -1261,10 +1488,6 @@ declare namespace Electron {
 		 * Resizes and moves the window to the supplied bounds
 		 */
 		setBounds(bounds: Rectangle, animate?: boolean): void;
-		/**
-		 * Note: The BrowserView API is currently experimental and may change or be removed
-		 * in future Electron releases.
-		 */
 		setBrowserView(browserView: BrowserView): void;
 		/**
 		 * Sets whether the window can be manually closed by user. On Linux does nothing.
@@ -1290,6 +1513,10 @@ declare namespace Electron {
 		 * bar will become gray when set to true.
 		 */
 		setDocumentEdited(edited: boolean): void;
+		/**
+		 * Disable or enable the window.
+		 */
+		setEnabled(enable: boolean): void;
 		/**
 		 * Changes whether the window can be focused.
 		 */
@@ -1316,7 +1543,7 @@ declare namespace Electron {
 		 * window will be passed to the window below this window, but if this window has
 		 * focus, it will still receive keyboard events.
 		 */
-		setIgnoreMouseEvents(ignore: boolean): void;
+		setIgnoreMouseEvents(ignore: boolean, options?: IgnoreMouseEventsOptions): void;
 		/**
 		 * Enters or leaves the kiosk mode.
 		 */
@@ -1353,6 +1580,10 @@ declare namespace Electron {
 		 * Sets whether the window can be moved by user. On Linux does nothing.
 		 */
 		setMovable(movable: boolean): void;
+		/**
+		 * Sets the opacity of the window. On Linux does nothing.
+		 */
+		setOpacity(opacity: number): void;
 		/**
 		 * Sets a 16 x 16 pixel overlay onto the current taskbar icon, usually used to
 		 * convey some sort of application status or to passively notify the user.
@@ -1393,6 +1624,11 @@ declare namespace Electron {
 		 * HTML-rendered toolbar. For example:
 		 */
 		setSheetOffset(offsetY: number, offsetX?: number): void;
+		/**
+		 * Enters or leaves simple fullscreen mode. Simple fullscreen mode emulates the
+		 * native fullscreen behavior found in versions of Mac OS X prior to Lion (10.7).
+		 */
+		setSimpleFullScreen(flag: boolean): void;
 		/**
 		 * Resizes the window to width and height.
 		 */
@@ -1456,6 +1692,11 @@ declare namespace Electron {
 		 * Shows the window but doesn't focus on it.
 		 */
 		showInactive(): void;
+		/**
+		 * Toggles the visibility of the tab bar if native tabs are enabled and there is
+		 * only one tab in the current window.
+		 */
+		toggleTabBar(): void;
 		/**
 		 * Unhooks all of the window messages.
 		 */
@@ -1689,7 +1930,7 @@ declare namespace Electron {
 			 * An object representing the HTTP response message.
 			 */
 			response: IncomingMessage) => void): this;
-		constructor(options: any | string);
+		constructor(options: 'method' | 'url' | 'session' | 'partition' | 'protocol' | 'host' | 'hostname' | 'port' | 'path' | 'redirect');
 		/**
 		 * Cancels an ongoing HTTP transaction. If the request has already emitted the
 		 * close event, the abort operation will have no effect. Otherwise an ongoing event
@@ -1917,7 +2158,7 @@ declare namespace Electron {
 		 */
 		on(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1930,7 +2171,7 @@ declare namespace Electron {
 			removed: boolean) => void): this;
 		once(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1943,7 +2184,7 @@ declare namespace Electron {
 			removed: boolean) => void): this;
 		addListener(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1956,7 +2197,7 @@ declare namespace Electron {
 			removed: boolean) => void): this;
 		removeListener(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1972,8 +2213,8 @@ declare namespace Electron {
 		 */
 		flushStore(callback: Function): void;
 		/**
-		 * Sends a request to get all cookies matching details, callback will be called
-		 * with callback(error, cookies) on complete.
+		 * Sends a request to get all cookies matching filter, callback will be called with
+		 * callback(error, cookies) on complete.
 		 */
 		get(filter: Filter, callback: (error: Error, cookies: Cookie[]) => void): void;
 		/**
@@ -1994,7 +2235,7 @@ declare namespace Electron {
 
 		/**
 		 * The number of average idle cpu wakeups per second since the last call to
-		 * getCPUUsage. First call returns 0.
+		 * getCPUUsage. First call returns 0. Will always return 0 on Windows.
 		 */
 		idleWakeupsPerSecond: number;
 		/**
@@ -2007,19 +2248,31 @@ declare namespace Electron {
 
 		// Docs: http://electron.atom.io/docs/api/structures/crash-report
 
-		date: string;
-		ID: number;
+		date: Date;
+		id: string;
 	}
 
 	interface CrashReporter extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/crash-reporter
 
+		/**
+		 * Set an extra parameter to be sent with the crash report. The values specified
+		 * here will be sent in addition to any values set via the extra option when start
+		 * was called. This API is only available on macOS, if you need to add/update extra
+		 * parameters on Linux and Windows after your first call to start you can call
+		 * start again with the updated extra options.
+		 */
+		addExtraParameter(key: string, value: string): void;
 		/**
 		 * Returns the date and ID of the last crash report. If no crash reports have been
 		 * sent or the crash reporter has not been started, null is returned.
 		 */
 		getLastCrashReport(): CrashReport;
+		/**
+		 * See all of the current parameters being passed to the crash reporter.
+		 */
+		getParameters(): void;
 		/**
 		 * Returns all uploaded crash reports. Each report contains the date and uploaded
 		 * ID.
@@ -2030,13 +2283,10 @@ declare namespace Electron {
 		 */
 		getUploadToServer(): boolean;
 		/**
-		 * Set an extra parameter to be sent with the crash report. The values specified
-		 * here will be sent in addition to any values set via the extra option when start
-		 * was called. This API is only available on macOS, if you need to add/update extra
-		 * parameters on Linux and Windows after your first call to start you can call
-		 * start again with the updated extra options.
+		 * Remove a extra parameter from the current set of parameters so that it will not
+		 * be sent with the crash report.
 		 */
-		setExtraParameter(key: string, value: string): void;
+		removeExtraParameter(key: string): void;
 		/**
 		 * This would normally be controlled by user preferences. This has no effect if
 		 * called before start is called. Note: This API can only be called from the main
@@ -2057,7 +2307,7 @@ declare namespace Electron {
 		 * well. This will start the process that will monitor and send the crash reports.
 		 * Replace submitURL, productName and crashesDirectory with appropriate values.
 		 * Note: If you need send additional/updated extra parameters after your first call
-		 * start you can call setExtraParameter on macOS or call start again with the
+		 * start you can call addExtraParameter on macOS or call start again with the
 		 * new/updated extra parameters on Linux and Windows. Note: On macOS, Electron uses
 		 * a new crashpad client for crash collection and reporting. If you want to enable
 		 * crash reporting, initializing crashpad from the main process using
@@ -2225,7 +2475,7 @@ declare namespace Electron {
 		/**
 		 * Displays a modal dialog that shows an error message. This API can be called
 		 * safely before the ready event the app module emits, it is usually used to report
-		 * errors in early stage of startup.  If called before the app readyevent on Linux,
+		 * errors in early stage of startup. If called before the app readyevent on Linux,
 		 * the message will be emitted to stderr, and no GUI dialog will appear.
 		 */
 		showErrorBox(title: string, content: string): void;
@@ -2253,11 +2503,11 @@ declare namespace Electron {
 		 * dots (e.g. 'png' is good but '.png' and '*.png' are bad). To show all files, use
 		 * the '*' wildcard (no other wildcard is supported). If a callback is passed, the
 		 * API call will be asynchronous and the result will be passed via
-		 * callback(filenames) Note: On Windows and Linux an open dialog can not be both a
+		 * callback(filenames). Note: On Windows and Linux an open dialog can not be both a
 		 * file selector and a directory selector, so if you set properties to ['openFile',
 		 * 'openDirectory'] on these platforms, a directory selector will be shown.
 		 */
-		showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions, callback?: (filePaths: string[]) => void): string[];
+		showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions, callback?: (filePaths: string[], bookmarks: string[]) => void): string[];
 		/**
 		 * The browserWindow argument allows the dialog to attach itself to a parent
 		 * window, making it modal. The filters specifies an array of file types that can
@@ -2266,27 +2516,27 @@ declare namespace Electron {
 		 * dots (e.g. 'png' is good but '.png' and '*.png' are bad). To show all files, use
 		 * the '*' wildcard (no other wildcard is supported). If a callback is passed, the
 		 * API call will be asynchronous and the result will be passed via
-		 * callback(filenames) Note: On Windows and Linux an open dialog can not be both a
+		 * callback(filenames). Note: On Windows and Linux an open dialog can not be both a
 		 * file selector and a directory selector, so if you set properties to ['openFile',
 		 * 'openDirectory'] on these platforms, a directory selector will be shown.
 		 */
-		showOpenDialog(options: OpenDialogOptions, callback?: (filePaths: string[]) => void): string[];
+		showOpenDialog(options: OpenDialogOptions, callback?: (filePaths: string[], bookmarks: string[]) => void): string[];
 		/**
 		 * The browserWindow argument allows the dialog to attach itself to a parent
 		 * window, making it modal. The filters specifies an array of file types that can
 		 * be displayed, see dialog.showOpenDialog for an example. If a callback is passed,
 		 * the API call will be asynchronous and the result will be passed via
-		 * callback(filename)
+		 * callback(filename).
 		 */
-		showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions, callback?: (filename: string) => void): string;
+		showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions, callback?: (filename: string, bookmark: string) => void): string;
 		/**
 		 * The browserWindow argument allows the dialog to attach itself to a parent
 		 * window, making it modal. The filters specifies an array of file types that can
 		 * be displayed, see dialog.showOpenDialog for an example. If a callback is passed,
 		 * the API call will be asynchronous and the result will be passed via
-		 * callback(filename)
+		 * callback(filename).
 		 */
-		showSaveDialog(options: SaveDialogOptions, callback?: (filename: string) => void): string;
+		showSaveDialog(options: SaveDialogOptions, callback?: (filename: string, bookmark: string) => void): string;
 	}
 
 	interface Display {
@@ -2325,33 +2575,54 @@ declare namespace Electron {
 		 * download that can't be resumed. The state can be one of following:
 		 */
 		on(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		once(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		addListener(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		removeListener(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		/**
 		 * Emitted when the download has been updated and is not done. The state can be one
 		 * of following:
 		 */
 		on(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		once(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		addListener(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		removeListener(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		/**
 		 * Cancels the download operation.
 		 */
 		cancel(): void;
-		/**
-		 * Resumes Boolean - Whether the download can resume.
-		 */
-		canResume(): void;
+		canResume(): boolean;
 		getContentDisposition(): string;
 		getETag(): string;
 		/**
@@ -2491,6 +2762,38 @@ declare namespace Electron {
 		webgl2: string;
 	}
 
+	interface InAppPurchase extends EventEmitter {
+
+		// Docs: http://electron.atom.io/docs/api/in-app-purchase
+
+		/**
+		 * Emitted when one or more transactions have been updated.
+		 */
+		on(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		once(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		addListener(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		removeListener(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		canMakePayments(): boolean;
+		getReceiptURL(): string;
+		purchaseProduct(productID: string, quantity?: number, callback?: (isProductValid: boolean) => void): void;
+	}
+
 	class IncomingMessage extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/incoming-message
@@ -2624,7 +2927,7 @@ declare namespace Electron {
 		/**
 		 * Removes all listeners, or those of the specified channel.
 		 */
-		removeAllListeners(channel?: string): this;
+		removeAllListeners(channel: string): this;
 		/**
 		 * Removes the specified listener from the listener array for the specified
 		 * channel.
@@ -2646,6 +2949,10 @@ declare namespace Electron {
 		 * renderer process, unless you know what you are doing you should never use it.
 		 */
 		sendSync(channel: string, ...args: any[]): any;
+		/**
+		 * Sends a message to a window with windowid via channel.
+		 */
+		sendTo(windowId: number, channel: string, ...args: any[]): void;
 		/**
 		 * Like ipcRenderer.send but the event will be sent to the <webview> element in the
 		 * host page instead of the main process.
@@ -2760,6 +3067,20 @@ declare namespace Electron {
 
 		// Docs: http://electron.atom.io/docs/api/menu
 
+		/**
+		 * Emitted when a popup is closed either manually or with menu.closePopup().
+		 */
+		on(event: 'menu-will-close', listener: (event: Event) => void): this;
+		once(event: 'menu-will-close', listener: (event: Event) => void): this;
+		addListener(event: 'menu-will-close', listener: (event: Event) => void): this;
+		removeListener(event: 'menu-will-close', listener: (event: Event) => void): this;
+		/**
+		 * Emitted when menu.popup() is called.
+		 */
+		on(event: 'menu-will-show', listener: (event: Event) => void): this;
+		once(event: 'menu-will-show', listener: (event: Event) => void): this;
+		addListener(event: 'menu-will-show', listener: (event: Event) => void): this;
+		removeListener(event: 'menu-will-show', listener: (event: Event) => void): this;
 		constructor();
 		/**
 		 * Generally, the template is just an array of options for constructing a MenuItem.
@@ -2772,7 +3093,7 @@ declare namespace Electron {
 		 * Note: The returned Menu instance doesn't support dynamic addition or removal of
 		 * menu items. Instance properties can still be dynamically modified.
 		 */
-		static getApplicationMenu(): Menu;
+		static getApplicationMenu(): Menu | null;
 		/**
 		 * Sends the action to the first responder of application. This is used for
 		 * emulating default macOS menu behaviors. Usually you would just use the role
@@ -2786,7 +3107,7 @@ declare namespace Electron {
 		 * Windows and Linux but has no effect on macOS. Note: This API has to be called
 		 * after the ready event of app module.
 		 */
-		static setApplicationMenu(menu: Menu): void;
+		static setApplicationMenu(menu: Menu | null): void;
 		/**
 		 * Appends the menuItem to the menu.
 		 */
@@ -2795,14 +3116,15 @@ declare namespace Electron {
 		 * Closes the context menu in the browserWindow.
 		 */
 		closePopup(browserWindow?: BrowserWindow): void;
+		getMenuItemById(id: string): MenuItem;
 		/**
 		 * Inserts the menuItem to the pos position of the menu.
 		 */
 		insert(pos: number, menuItem: MenuItem): void;
 		/**
-		 * Pops up this menu as a context menu in the browserWindow.
+		 * Pops up this menu as a context menu in the BrowserWindow.
 		 */
-		popup(browserWindow?: BrowserWindow, options?: PopupOptions): void;
+		popup(options: PopupOptions): void;
 		items: MenuItem[];
 	}
 
@@ -2848,6 +3170,13 @@ declare namespace Electron {
 		 * Creates a new NativeImage instance from dataURL.
 		 */
 		static createFromDataURL(dataURL: string): NativeImage;
+		/**
+		 * Creates a new NativeImage instance from the NSImage that maps to the given image
+		 * name. See NSImageName for a list of possible values. The hslShift is applied to
+		 * the image with the following rules This means that [-1, 0, 1] will make the
+		 * image completely white and [-1, 1, 0] will make the image completely black.
+		 */
+		static createFromNamedImage(imageName: string, hslShift: number[]): NativeImage;
 		/**
 		 * Creates a new NativeImage instance from a file located at path. This method
 		 * returns an empty image if the path does not exist, cannot be read, or is not a
@@ -2911,22 +3240,22 @@ declare namespace Electron {
 
 		on(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		once(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		addListener(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		removeListener(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		/**
@@ -2938,7 +3267,7 @@ declare namespace Electron {
 		removeListener(event: 'click', listener: (event: Event) => void): this;
 		/**
 		 * Emitted when the notification is closed by manual intervention from the user.
-		 * This event is not guarunteed to be emitted in all cases where the notification
+		 * This event is not guaranteed to be emitted in all cases where the notification
 		 * is closed.
 		 */
 		on(event: 'close', listener: (event: Event) => void): this;
@@ -2951,22 +3280,22 @@ declare namespace Electron {
 		 */
 		on(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		once(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		addListener(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		removeListener(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		/**
@@ -2980,11 +3309,17 @@ declare namespace Electron {
 		removeListener(event: 'show', listener: (event: Event) => void): this;
 		constructor(options: NotificationConstructorOptions);
 		static isSupported(): boolean;
+		/**
+		 * Dismisses the notification.
+		 */
+		close(): void;
 		/**
 		 * Immediately shows the notification to the user, please note this means unlike
 		 * the HTML5 Notification implementation, simply instantiating a new Notification
 		 * does not immediately show it to the user, you need to call this method before
-		 * the OS will display it.
+		 * the OS will display it. If the notification has been shown before, this method
+		 * will dismiss the previously shown notification and create a new one with
+		 * identical properties.
 		 */
 		show(): void;
 	}
@@ -3036,6 +3371,16 @@ declare namespace Electron {
 		once(event: 'resume', listener: Function): this;
 		addListener(event: 'resume', listener: Function): this;
 		removeListener(event: 'resume', listener: Function): this;
+		/**
+		 * Emitted when the system is about to reboot or shut down. If the event handler
+		 * invokes e.preventDefault(), Electron will attempt to delay system shutdown in
+		 * order for the app to exit cleanly. If e.preventDefault() is called, the app
+		 * should exit as soon as possible by calling something like app.quit().
+		 */
+		on(event: 'shutdown', listener: Function): this;
+		once(event: 'shutdown', listener: Function): this;
+		addListener(event: 'shutdown', listener: Function): this;
+		removeListener(event: 'shutdown', listener: Function): this;
 		/**
 		 * Emitted when the system is suspending.
 		 */
@@ -3118,6 +3463,11 @@ declare namespace Electron {
 		 * sends a new HTTP request as a response.
 		 */
 		interceptHttpProtocol(scheme: string, handler: (request: InterceptHttpProtocolRequest, callback: (redirectRequest: RedirectRequest) => void) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Same as protocol.registerStreamProtocol, except that it replaces an existing
+		 * protocol handler.
+		 */
+		interceptStreamProtocol(scheme: string, handler: (request: InterceptStreamProtocolRequest, callback: (stream?: ReadableStream | StreamProtocolResponse) => void) => void, completion?: (error: Error) => void): void;
 		/**
 		 * Intercepts scheme protocol and uses handler as the protocol's new handler which
 		 * sends a String as a response.
@@ -3178,6 +3528,15 @@ declare namespace Electron {
 		 * the ready event of the app module gets emitted.
 		 */
 		registerStandardSchemes(schemes: string[], options?: RegisterStandardSchemesOptions): void;
+		/**
+		 * Registers a protocol of scheme that will send a Readable as a response. The
+		 * usage is similar to the other register{Any}Protocol, except that the callback
+		 * should be called with either a Readable object or an object that has the data,
+		 * statusCode, and headers properties. Example: It is possible to pass any object
+		 * that implements the readable stream API (emits data/end/error events). For
+		 * example, here's how a file could be returned:
+		 */
+		registerStreamProtocol(scheme: string, handler: (request: RegisterStreamProtocolRequest, callback: (stream?: ReadableStream | StreamProtocolResponse) => void) => void, completion?: (error: Error) => void): void;
 		/**
 		 * Registers a protocol of scheme that will send a String as a response. The usage
 		 * is the same with registerFileProtocol, except that the callback should be called
@@ -3380,7 +3739,7 @@ declare namespace Electron {
 		 * options, you have to ensure the Session with the partition has never been used
 		 * before. There is no way to change the options of an existing Session object.
 		 */
-		static fromPartition(partition: string, options: FromPartitionOptions): Session;
+		static fromPartition(partition: string, options?: FromPartitionOptions): Session;
 		/**
 		 * A Session object, the default session object of the app.
 		 */
@@ -3444,11 +3803,12 @@ declare namespace Electron {
 		 * Writes any unwritten DOMStorage data to disk.
 		 */
 		flushStorageData(): void;
-		getBlobData(identifier: string, callback: (result: Buffer) => void): Blob;
+		getBlobData(identifier: string, callback: (result: Buffer) => void): void;
 		/**
 		 * Callback is invoked with the session's current cache size.
 		 */
 		getCacheSize(callback: (size: number) => void): void;
+		getPreloads(): string[];
 		getUserAgent(): string;
 		/**
 		 * Resolves the proxy information for url. The callback will be called with
@@ -3471,9 +3831,14 @@ declare namespace Electron {
 		/**
 		 * Sets the handler which can be used to respond to permission requests for the
 		 * session. Calling callback(true) will allow the permission and callback(false)
-		 * will reject it.
+		 * will reject it. To clear the handler, call setPermissionRequestHandler(null).
 		 */
-		setPermissionRequestHandler(handler: (webContents: WebContents, permission: string, callback: (permissionGranted: boolean) => void) => void): void;
+		setPermissionRequestHandler(handler: (webContents: WebContents, permission: string, callback: (permissionGranted: boolean) => void, details: PermissionRequestHandlerDetails) => void | null): void;
+		/**
+		 * Adds scripts that will be executed on ALL web contents that are associated with
+		 * this session just before normal preload scripts run.
+		 */
+		setPreloads(preloads: string[]): void;
 		/**
 		 * Sets the proxy settings. When pacScript and proxyRules are provided together,
 		 * the proxyRules option is ignored and pacScript configuration is applied. The
@@ -3578,6 +3943,24 @@ declare namespace Electron {
 		width: number;
 	}
 
+	interface StreamProtocolResponse {
+
+		// Docs: http://electron.atom.io/docs/api/structures/stream-protocol-response
+
+		/**
+		 * A Node.js readable stream representing the response body
+		 */
+		data: ReadableStream;
+		/**
+		 * An object containing the response headers
+		 */
+		headers: Headers;
+		/**
+		 * The HTTP response code
+		 */
+		statusCode: number;
+	}
+
 	interface SystemPreferences extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/system-preferences
@@ -3633,7 +4016,7 @@ declare namespace Electron {
 		getAccentColor(): string;
 		getColor(color: '3d-dark-shadow' | '3d-face' | '3d-highlight' | '3d-light' | '3d-shadow' | 'active-border' | 'active-caption' | 'active-caption-gradient' | 'app-workspace' | 'button-text' | 'caption-text' | 'desktop' | 'disabled-text' | 'highlight' | 'highlight-text' | 'hotlight' | 'inactive-border' | 'inactive-caption' | 'inactive-caption-gradient' | 'inactive-caption-text' | 'info-background' | 'info-text' | 'menu' | 'menu-highlight' | 'menubar' | 'menu-text' | 'scrollbar' | 'window' | 'window-frame' | 'window-text'): string;
 		/**
-		 * This API uses NSUserDefaults on macOS. Some popular key and types are:
+		 * Some popular key and types are:
 		 */
 		getUserDefault(key: string, type: 'string' | 'boolean' | 'integer' | 'float' | 'double' | 'url' | 'array' | 'dictionary'): any;
 		/**
@@ -3655,14 +4038,22 @@ declare namespace Electron {
 		 */
 		postNotification(event: string, userInfo: any): void;
 		/**
-		 * Set the value of key in system preferences. Note that type should match actual
-		 * type of value. An exception is thrown if they don't. This API uses
-		 * NSUserDefaults on macOS. Some popular key and types are:
+		 * Add the specified defaults to your application's NSUserDefaults.
+		 */
+		registerDefaults(defaults: any): void;
+		/**
+		 * Removes the key in NSUserDefaults. This can be used to restore the default or
+		 * global value of a key previously set with setUserDefault.
+		 */
+		removeUserDefault(key: string): void;
+		/**
+		 * Set the value of key in NSUserDefaults. Note that type should match actual type
+		 * of value. An exception is thrown if they don't. Some popular key and types are:
 		 */
 		setUserDefault(key: string, type: string, value: string): void;
 		/**
 		 * Same as subscribeNotification, but uses NSNotificationCenter for local defaults.
-		 * This is necessary for events such as NSUserDefaultsDidChangeNotification
+		 * This is necessary for events such as NSUserDefaultsDidChangeNotification.
 		 */
 		subscribeLocalNotification(event: string, callback: (event: string, userInfo: any) => void): void;
 		/**
@@ -3830,7 +4221,7 @@ declare namespace Electron {
 		// Docs: http://electron.atom.io/docs/api/touch-bar
 
 		constructor(options: TouchBarConstructorOptions);
-		escapeItem: any;
+		escapeItem: (TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer | null);
 		static TouchBarButton: typeof TouchBarButton;
 		static TouchBarColorPicker: typeof TouchBarColorPicker;
 		static TouchBarGroup: typeof TouchBarGroup;
@@ -3842,6 +4233,23 @@ declare namespace Electron {
 		static TouchBarSpacer: typeof TouchBarSpacer;
 	}
 
+	interface Transaction {
+
+		// Docs: http://electron.atom.io/docs/api/structures/transaction
+
+		errorCode: number;
+		errorMessage: string;
+		originalTransactionIdentifier: string;
+		payment: Payment;
+		transactionDate: string;
+		transactionIdentifier: string;
+		/**
+		 * The transaction sate ("purchasing", "purchased", "failed", "restored", or
+		 * "deferred")
+		 */
+		transactionState: string;
+	}
+
 	class Tray extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/tray
@@ -3873,45 +4281,61 @@ declare namespace Electron {
 		 */
 		on(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		once(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		addListener(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		removeListener(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		/**
 		 * Emitted when the tray icon is double clicked.
 		 */
 		on(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		once(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		addListener(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		removeListener(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		/**
@@ -3970,22 +4394,22 @@ declare namespace Electron {
 		 */
 		on(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		once(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		addListener(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		removeListener(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		/**
@@ -3993,22 +4417,22 @@ declare namespace Electron {
 		 */
 		on(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		once(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		addListener(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		removeListener(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		/**
@@ -4016,22 +4440,45 @@ declare namespace Electron {
 		 */
 		on(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		once(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		addListener(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		removeListener(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		/**
+		 * Emitted when the mouse moves in the tray icon.
+		 */
+		on(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		once(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		addListener(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		removeListener(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		/**
@@ -4039,22 +4486,22 @@ declare namespace Electron {
 		 */
 		on(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		once(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		addListener(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		removeListener(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		constructor(image: NativeImage | string);
@@ -4096,7 +4543,8 @@ declare namespace Electron {
 		 */
 		setPressedImage(image: NativeImage): void;
 		/**
-		 * Sets the title displayed aside of the tray icon in the status bar.
+		 * Sets the title displayed aside of the tray icon in the status bar (Support ANSI
+		 * colors).
 		 */
 		setTitle(title: string): void;
 		/**
@@ -4150,7 +4598,7 @@ declare namespace Electron {
 		 */
 		length: number;
 		/**
-		 * Last Modification time in number of seconds sine the UNIX epoch.
+		 * Last Modification time in number of seconds since the UNIX epoch.
 		 */
 		modificationTime: number;
 		/**
@@ -4176,7 +4624,7 @@ declare namespace Electron {
 		 */
 		length: number;
 		/**
-		 * Last Modification time in number of seconds sine the UNIX epoch.
+		 * Last Modification time in number of seconds since the UNIX epoch.
 		 */
 		modificationTime: number;
 		/**
@@ -4217,22 +4665,22 @@ declare namespace Electron {
 		 */
 		on(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		once(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		addListener(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		removeListener(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		/**
@@ -4242,7 +4690,7 @@ declare namespace Electron {
 		on(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
@@ -4250,7 +4698,7 @@ declare namespace Electron {
 		once(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
@@ -4258,7 +4706,7 @@ declare namespace Electron {
 		addListener(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
@@ -4266,11 +4714,31 @@ declare namespace Electron {
 		removeListener(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
 			callback: (isTrusted: boolean) => void) => void): this;
+		/**
+		 * Emitted when the associated window logs a console message. Will not be emitted
+		 * for windows with offscreen rendering enabled.
+		 */
+		on(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
+		once(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
+		addListener(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
+		removeListener(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
 		/**
 		 * Emitted when there is a new context menu that needs to be handled.
 		 */
@@ -4300,69 +4768,69 @@ declare namespace Electron {
 		 * nwse-resize, col-resize, row-resize, m-panning, e-panning, n-panning,
 		 * ne-panning, nw-panning, s-panning, se-panning, sw-panning, w-panning, move,
 		 * vertical-text, cell, context-menu, alias, progress, nodrop, copy, none,
-		 * not-allowed, zoom-in, zoom-out, grab, grabbing, custom. If the type parameter is
-		 * custom, the image parameter will hold the custom cursor image in a NativeImage,
-		 * and scale, size and hotspot will hold additional information about the custom
-		 * cursor.
+		 * not-allowed, zoom-in, zoom-out, grab, grabbing or custom. If the type parameter
+		 * is custom, the image parameter will hold the custom cursor image in a
+		 * NativeImage, and scale, size and hotspot will hold additional information about
+		 * the custom cursor.
 		 */
 		on(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		once(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		addListener(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		removeListener(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		/**
@@ -4400,14 +4868,53 @@ declare namespace Electron {
 		once(event: 'devtools-reload-page', listener: Function): this;
 		addListener(event: 'devtools-reload-page', listener: Function): this;
 		removeListener(event: 'devtools-reload-page', listener: Function): this;
+		/**
+		 * Emitted when a <webview> has been attached to this web contents.
+		 */
+		on(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
+		once(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
+		addListener(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
+		removeListener(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
 		/**
 		 * Emitted when a page's theme color changes. This is usually due to encountering a
 		 * meta tag:
 		 */
-		on(event: 'did-change-theme-color', listener: Function): this;
-		once(event: 'did-change-theme-color', listener: Function): this;
-		addListener(event: 'did-change-theme-color', listener: Function): this;
-		removeListener(event: 'did-change-theme-color', listener: Function): this;
+		on(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
+		once(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
+		addListener(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
+		removeListener(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
 		/**
 		 * This event is like did-finish-load but emitted when the load failed or was
 		 * cancelled, e.g. window.stop() is invoked. The full list of error codes and their
@@ -4643,7 +5150,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4660,7 +5167,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4677,7 +5184,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4694,7 +5201,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4707,22 +5214,22 @@ declare namespace Electron {
 		 */
 		on(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		once(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		addListener(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		removeListener(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		/**
@@ -4771,8 +5278,8 @@ declare namespace Electron {
 		/**
 		 * Emitted when bluetooth device needs to be selected on call to
 		 * navigator.bluetooth.requestDevice. To use navigator.bluetooth api webBluetooth
-		 * should be enabled.  If event.preventDefault is not called, first available
-		 * device will be selected. callback should be called with deviceId to be selected,
+		 * should be enabled. If event.preventDefault is not called, first available device
+		 * will be selected. callback should be called with deviceId to be selected,
 		 * passing empty string to callback will cancel the request.
 		 */
 		on(event: 'select-bluetooth-device', listener: (event: Event,
@@ -4935,13 +5442,13 @@ declare namespace Electron {
 		 * called with callback(image). The image is an instance of NativeImage that stores
 		 * data of the snapshot. Omitting rect will capture the whole visible page.
 		 */
-		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
+		capturePage(callback: (image: NativeImage) => void): void;
 		/**
 		 * Captures a snapshot of the page within rect. Upon completion callback will be
 		 * called with callback(image). The image is an instance of NativeImage that stores
 		 * data of the snapshot. Omitting rect will capture the whole visible page.
 		 */
-		capturePage(callback: (image: NativeImage) => void): void;
+		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
 		/**
 		 * Clears the navigation history.
 		 */
@@ -4988,16 +5495,15 @@ declare namespace Electron {
 		 * requestFullScreen can only be invoked by a gesture from the user. Setting
 		 * userGesture to true will remove this limitation. If the result of the executed
 		 * code is a promise the callback result will be the resolved value of the promise.
-		 *  We recommend that you use the returned Promise to handle code that results in a
+		 * We recommend that you use the returned Promise to handle code that results in a
 		 * Promise.
 		 */
 		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): Promise<any>;
 		/**
-		 * Starts a request to find all matches for the text in the web page and returns an
-		 * Integer representing the request id used for the request. The result of the
-		 * request can be obtained by subscribing to found-in-page event.
+		 * Starts a request to find all matches for the text in the web page. The result of
+		 * the request can be obtained by subscribing to found-in-page event.
 		 */
-		findInPage(text: string, options?: FindInPageOptions): void;
+		findInPage(text: string, options?: FindInPageOptions): number;
 		/**
 		 * Focuses the web page.
 		 */
@@ -5076,6 +5582,12 @@ declare namespace Electron {
 		isOffscreen(): boolean;
 		isPainting(): boolean;
 		isWaitingForResponse(): boolean;
+		/**
+		 * Loads the given file in the window, filePath should be a path to an HTML file
+		 * relative to the root of your application.  For instance an app structure like
+		 * this: Would require code like this
+		 */
+		loadFile(filePath: string): void;
 		/**
 		 * Loads the url in the window. The url must contain the protocol prefix, e.g. the
 		 * http:// or file://. If the load should bypass http cache then use the pragma
@@ -5083,7 +5595,9 @@ declare namespace Electron {
 		 */
 		loadURL(url: string, options?: LoadURLOptions): void;
 		/**
-		 * Opens the devtools.
+		 * Opens the devtools. When contents is a <webview> tag, the mode would be detach
+		 * by default, explicitly passing an empty mode can force using last used dock
+		 * state.
 		 */
 		openDevTools(options?: OpenDevToolsOptions): void;
 		/**
@@ -5101,7 +5615,7 @@ declare namespace Electron {
 		 * webContents.print({silent: false, printBackground: false, deviceName: ''}). Use
 		 * page-break-before: always; CSS style to force to print to a new page.
 		 */
-		print(options?: PrintOptions): void;
+		print(options?: PrintOptions, callback?: (success: boolean) => void): void;
 		/**
 		 * Prints window's web page as PDF with Chromium's preview printing custom
 		 * settings. The callback will be called with callback(error, data) on completion.
@@ -5160,6 +5674,19 @@ declare namespace Electron {
 		 * Mute the audio on the current web page.
 		 */
 		setAudioMuted(muted: boolean): void;
+		/**
+		 * Uses the devToolsWebContents as the target WebContents to show devtools. The
+		 * devToolsWebContents must not have done any navigation, and it should not be used
+		 * for other purposes after the call. By default Electron manages the devtools by
+		 * creating an internal WebContents with native view, which developers have very
+		 * limited control of. With the setDevToolsWebContents method, developers can use
+		 * any WebContents to show the devtools in it, including BrowserWindow, BrowserView
+		 * and <webview> tag. Note that closing the devtools does not destroy the
+		 * devToolsWebContents, it is caller's responsibility to destroy
+		 * devToolsWebContents. An example of showing devtools in a <webview> tag: An
+		 * example of showing devtools in a BrowserWindow:
+		 */
+		setDevToolsWebContents(devToolsWebContents: WebContents): void;
 		/**
 		 * If offscreen rendering is enabled sets the frame rate to the specified number.
 		 * Only values between 1 and 60 are accepted.
@@ -5187,7 +5714,7 @@ declare namespace Electron {
 		setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
 		/**
 		 * Setting the WebRTC IP handling policy allows you to control which IPs are
-		 * exposed via WebRTC.  See BrowserLeaks for more details.
+		 * exposed via WebRTC. See BrowserLeaks for more details.
 		 */
 		setWebRTCIPHandlingPolicy(policy: 'default' | 'default_public_interface_only' | 'default_public_and_private_interfaces' | 'disable_non_proxied_udp'): void;
 		/**
@@ -5198,14 +5725,10 @@ declare namespace Electron {
 		/**
 		 * Changes the zoom level to the specified level. The original size is 0 and each
 		 * increment above or below represents zooming 20% larger or smaller to default
-		 * limits of 300% and 50% of original size, respectively.
+		 * limits of 300% and 50% of original size, respectively. The formula for this is
+		 * scale := 1.2 ^ level.
 		 */
 		setZoomLevel(level: number): void;
-		/**
-		 * Deprecated: Call setVisualZoomLevelLimits instead to set the visual zoom level
-		 * limits. This method will be removed in Electron 2.0.
-		 */
-		setZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
 		/**
 		 * Shows pop-up dictionary that searches the selected word on the page.
 		 */
@@ -5276,6 +5799,10 @@ declare namespace Electron {
 		 * userGesture to true will remove this limitation.
 		 */
 		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): Promise<any>;
+		/**
+		 * Work like executeJavaScript but evaluates scripts in isolated context.
+		 */
+		executeJavaScriptInIsolatedWorld(worldId: number, scripts: WebSource[], userGesture?: boolean, callback?: (result: any) => void): void;
 		/**
 		 * Returns an object describing usage information of Blink's internal memory
 		 * caches. This will generate:
@@ -5305,6 +5832,18 @@ declare namespace Electron {
 		 * cannot be corrupted by active network attackers.
 		 */
 		registerURLSchemeAsSecure(scheme: string): void;
+		/**
+		 * Set the content security policy of the isolated world.
+		 */
+		setIsolatedWorldContentSecurityPolicy(worldId: number, csp: string): void;
+		/**
+		 * Set the name of the isolated world. Useful in devtools.
+		 */
+		setIsolatedWorldHumanReadableName(worldId: number, name: string): void;
+		/**
+		 * Set the security origin of the isolated world.
+		 */
+		setIsolatedWorldSecurityOrigin(worldId: number, securityOrigin: string): void;
 		/**
 		 * Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
 		 */
@@ -5330,22 +5869,28 @@ declare namespace Electron {
 		 * limits of 300% and 50% of original size, respectively.
 		 */
 		setZoomLevel(level: number): void;
-		/**
-		 * Deprecated: Call setVisualZoomLevelLimits instead to set the visual zoom level
-		 * limits. This method will be removed in Electron 2.0.
-		 */
-		setZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
 	}
 
 	class WebRequest extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/web-request
 
+		/**
+		 * The listener will be called with listener(details) when a server initiated
+		 * redirect is about to occur.
+		 */
+		onBeforeRedirect(listener: (details: OnBeforeRedirectDetails) => void): void;
 		/**
 		 * The listener will be called with listener(details) when a server initiated
 		 * redirect is about to occur.
 		 */
 		onBeforeRedirect(filter: OnBeforeRedirectFilter, listener: (details: OnBeforeRedirectDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details, callback) when a request is
+		 * about to occur. The uploadData is an array of UploadData objects. The callback
+		 * has to be called with an response object.
+		 */
+		onBeforeRequest(listener: (details: OnBeforeRequestDetails, callback: (response: Response) => void) => void): void;
 		/**
 		 * The listener will be called with listener(details, callback) when a request is
 		 * about to occur. The uploadData is an array of UploadData objects. The callback
@@ -5359,10 +5904,25 @@ declare namespace Electron {
 		 * has to be called with an response object.
 		 */
 		onBeforeSendHeaders(filter: OnBeforeSendHeadersFilter, listener: Function): void;
+		/**
+		 * The listener will be called with listener(details, callback) before sending an
+		 * HTTP request, once the request headers are available. This may occur after a TCP
+		 * connection is made to the server, but before any http data is sent. The callback
+		 * has to be called with an response object.
+		 */
+		onBeforeSendHeaders(listener: Function): void;
 		/**
 		 * The listener will be called with listener(details) when a request is completed.
 		 */
 		onCompleted(filter: OnCompletedFilter, listener: (details: OnCompletedDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details) when a request is completed.
+		 */
+		onCompleted(listener: (details: OnCompletedDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details) when an error occurs.
+		 */
+		onErrorOccurred(listener: (details: OnErrorOccurredDetails) => void): void;
 		/**
 		 * The listener will be called with listener(details) when an error occurs.
 		 */
@@ -5373,6 +5933,18 @@ declare namespace Electron {
 		 * response object.
 		 */
 		onHeadersReceived(filter: OnHeadersReceivedFilter, listener: Function): void;
+		/**
+		 * The listener will be called with listener(details, callback) when HTTP response
+		 * headers of a request have been received. The callback has to be called with an
+		 * response object.
+		 */
+		onHeadersReceived(listener: Function): void;
+		/**
+		 * The listener will be called with listener(details) when first byte of the
+		 * response body is received. For HTTP requests, this means that the status line
+		 * and response headers are available.
+		 */
+		onResponseStarted(listener: (details: OnResponseStartedDetails) => void): void;
 		/**
 		 * The listener will be called with listener(details) when first byte of the
 		 * response body is received. For HTTP requests, this means that the status line
@@ -5385,6 +5957,24 @@ declare namespace Electron {
 		 * response are visible by the time this listener is fired.
 		 */
 		onSendHeaders(filter: OnSendHeadersFilter, listener: (details: OnSendHeadersDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details) just before a request is
+		 * going to be sent to the server, modifications of previous onBeforeSendHeaders
+		 * response are visible by the time this listener is fired.
+		 */
+		onSendHeaders(listener: (details: OnSendHeadersDetails) => void): void;
+	}
+
+	interface WebSource {
+
+		// Docs: http://electron.atom.io/docs/api/structures/web-source
+
+		code: string;
+		/**
+		 * Default is 1.
+		 */
+		startLine?: number;
+		url?: string;
 	}
 
 	interface WebviewTag extends HTMLElement {
@@ -5575,6 +6165,10 @@ declare namespace Electron {
 		 */
 		addEventListener(event: 'devtools-focused', listener: (event: Event) => void, useCapture?: boolean): this;
 		removeEventListener(event: 'devtools-focused', listener: (event: Event) => void): this;
+		addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+		addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+		removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+		removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 		canGoBack(): boolean;
 		canGoForward(): boolean;
 		canGoToOffset(offset: number): boolean;
@@ -5613,13 +6207,12 @@ declare namespace Electron {
 		 * context in the page. HTML APIs like requestFullScreen, which require user
 		 * action, can take advantage of this option for automation.
 		 */
-		executeJavaScript(code: string, userGesture: boolean, callback?: (result: any) => void): void;
+		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
 		/**
-		 * Starts a request to find all matches for the text in the web page and returns an
-		 * Integer representing the request id used for the request. The result of the
-		 * request can be obtained by subscribing to found-in-page event.
+		 * Starts a request to find all matches for the text in the web page. The result of
+		 * the request can be obtained by subscribing to found-in-page event.
 		 */
-		findInPage(text: string, options?: FindInPageOptions): void;
+		findInPage(text: string, options?: FindInPageOptions): number;
 		getTitle(): string;
 		getURL(): string;
 		getUserAgent(): string;
@@ -6062,6 +6655,10 @@ declare namespace Electron {
 		 * is true.
 		 */
 		fullscreenable?: boolean;
+		/**
+		 * Use pre-Lion fullscreen on macOS. Default is false.
+		 */
+		simpleFullscreen?: boolean;
 		/**
 		 * Whether to show the window in taskbar. Default is false.
 		 */
@@ -6115,7 +6712,7 @@ declare namespace Electron {
 		 */
 		enableLargerThanScreen?: boolean;
 		/**
-		 * Window's background color as Hexadecimal value, like #66CD00 or #FFF or
+		 * Window's background color as a hexadecimal value, like #66CD00 or #FFF or
 		 * #80FFFFFF (alpha is supported). Default is #FFF (white).
 		 */
 		backgroundColor?: string;
@@ -6124,6 +6721,11 @@ declare namespace Electron {
 		 * is true.
 		 */
 		hasShadow?: boolean;
+		/**
+		 * Set the initial opacity of the window, between 0.0 (fully transparent) and 1.0
+		 * (fully opaque). This is only implemented on Windows and macOS.
+		 */
+		opacity?: number;
 		/**
 		 * Forces using dark theme for the window, only works on some GTK+3 desktop
 		 * environments. Default is false.
@@ -6140,9 +6742,9 @@ declare namespace Electron {
 		/**
 		 * The style of window title bar. Default is default. Possible values are:
 		 */
-		titleBarStyle?: ('default' | 'hidden' | 'hidden-inset' | 'hiddenInset' | 'customButtonsOnHover');
+		titleBarStyle?: ('default' | 'hidden' | 'hiddenInset' | 'customButtonsOnHover');
 		/**
-		 * Shows the title in the tile bar in full screen mode on macOS for all
+		 * Shows the title in the title bar in full screen mode on macOS for all
 		 * titleBarStyle options. Default is false.
 		 */
 		fullscreenWindowTitle?: boolean;
@@ -6196,7 +6798,11 @@ declare namespace Electron {
 		/**
 		 * Verification result from chromium.
 		 */
-		error: string;
+		verificationResult: string;
+		/**
+		 * Error code.
+		 */
+		errorCode: number;
 	}
 
 	interface ClearStorageDataOptions {
@@ -6206,7 +6812,7 @@ declare namespace Electron {
 		origin?: string;
 		/**
 		 * The types of storages to clear, can contain: appcache, cookies, filesystem,
-		 * indexdb, localstorage, shadercache, websql, serviceworkers
+		 * indexdb, localstorage, shadercache, websql, serviceworkers.
 		 */
 		storages?: string[];
 		/**
@@ -6253,11 +6859,11 @@ declare namespace Electron {
 
 	interface ContextMenuParams {
 		/**
-		 * x coordinate
+		 * x coordinate.
 		 */
 		x: number;
 		/**
-		 * y coordinate
+		 * y coordinate.
 		 */
 		y: number;
 		/**
@@ -6317,8 +6923,8 @@ declare namespace Electron {
 		 */
 		inputFieldType: string;
 		/**
-		 * Input source that invoked the context menu. Can be none, mouse, keyboard, touch,
-		 * touchMenu.
+		 * Input source that invoked the context menu. Can be none, mouse, keyboard, touch
+		 * or touchMenu.
 		 */
 		menuSourceType: ('none' | 'mouse' | 'keyboard' | 'touch' | 'touchMenu');
 		/**
@@ -6355,9 +6961,10 @@ declare namespace Electron {
 		 * properties are sent correctly. Nested objects are not supported and the property
 		 * names and values must be less than 64 characters long.
 		 */
-		extra?: any;
+		extra?: Extra;
 		/**
-		 * Only used when the crash reporter is used in a forked process (macOS only).
+		 * Directory to store the crashreports temporarily (only used when the crash
+		 * reporter is started via process.crashReporter.start).
 		 */
 		crashesDirectory?: string;
 	}
@@ -6502,9 +7109,12 @@ declare namespace Electron {
 	}
 
 	interface DisplayBalloonOptions {
+		/**
+		 * -
+		 */
 		icon?: NativeImage | string;
-		title?: string;
-		content?: string;
+		title: string;
+		content: string;
 	}
 
 	interface Dock {
@@ -6569,6 +7179,18 @@ declare namespace Electron {
 	interface Extensions {
 	}
 
+	interface FeedURLOptions {
+		url: string;
+		/**
+		 * HTTP request headers.
+		 */
+		headers?: Headers;
+		/**
+		 * Either json or default, see the README for more information.
+		 */
+		serverType?: string;
+	}
+
 	interface FileIconOptions {
 		size: ('small' | 'normal' | 'large');
 	}
@@ -6584,7 +7206,7 @@ declare namespace Electron {
 		 */
 		name?: string;
 		/**
-		 * Retrieves cookies whose domains match or are subdomains of domains
+		 * Retrieves cookies whose domains match or are subdomains of domains.
 		 */
 		domain?: string;
 		/**
@@ -6644,6 +7266,18 @@ declare namespace Electron {
 		name: string;
 	}
 
+	interface Headers {
+	}
+
+	interface IgnoreMouseEventsOptions {
+		/**
+		 * If true, forwards mouse move messages to Chromium, enabling mouse related events
+		 * such as mouseleave. Only used when ignore is true. If ignore is false,
+		 * forwarding is always disabled regardless of this value.
+		 */
+		forward?: boolean;
+	}
+
 	interface ImportCertificateOptions {
 		/**
 		 * Path for the pkcs12 file.
@@ -6657,35 +7291,35 @@ declare namespace Electron {
 
 	interface Input {
 		/**
-		 * Either keyUp or keyDown
+		 * Either keyUp or keyDown.
 		 */
 		type: string;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		key: string;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		code: string;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		isAutoRepeat: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		shift: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		control: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		alt: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		meta: boolean;
 	}
@@ -6711,6 +7345,14 @@ declare namespace Electron {
 		uploadData: UploadData[];
 	}
 
+	interface InterceptStreamProtocolRequest {
+		url: string;
+		headers: Headers;
+		referrer: string;
+		method: string;
+		uploadData: UploadData[];
+	}
+
 	interface InterceptStringProtocolRequest {
 		url: string;
 		referrer: string;
@@ -6767,6 +7409,9 @@ declare namespace Electron {
 		 * Extra headers separated by "\n"
 		 */
 		extraHeaders?: string;
+		/**
+		 * -
+		 */
 		postData?: UploadRawData[] | UploadFile[] | UploadFileSystem[] | UploadBlob[];
 		/**
 		 * Base url (with trailing path separator) for files to be loaded by the data url.
@@ -6783,25 +7428,25 @@ declare namespace Electron {
 		 */
 		openAtLogin: boolean;
 		/**
-		 * true if the app is set to open as hidden at login. This setting is only
-		 * supported on macOS.
+		 * true if the app is set to open as hidden at login. This setting is not available
+		 * on .
 		 */
 		openAsHidden: boolean;
 		/**
-		 * true if the app was opened at login automatically. This setting is only
-		 * supported on macOS.
+		 * true if the app was opened at login automatically. This setting is not available
+		 * on .
 		 */
 		wasOpenedAtLogin: boolean;
 		/**
 		 * true if the app was opened as a hidden login item. This indicates that the app
-		 * should not open any windows at startup. This setting is only supported on macOS.
+		 * should not open any windows at startup. This setting is not available on .
 		 */
 		wasOpenedAsHidden: boolean;
 		/**
 		 * true if the app was opened as a login item that should restore the state from
 		 * the previous session. This indicates that the app should restore the windows
-		 * that were open the last time the app was closed. This setting is only supported
-		 * on macOS.
+		 * that were open the last time the app was closed. This setting is not available
+		 * on .
 		 */
 		restoreState: boolean;
 	}
@@ -6827,7 +7472,7 @@ declare namespace Electron {
 		 * Define the action of the menu item, when specified the click property will be
 		 * ignored. See .
 		 */
-		role?: MenuItemRole;
+		role?: string;
 		/**
 		 * Can be normal, separator, submenu, checkbox or radio.
 		 */
@@ -6850,7 +7495,7 @@ declare namespace Electron {
 		checked?: boolean;
 		/**
 		 * Should be specified for submenu type menu items. If submenu is specified, the
-		 * type: 'submenu' can be omitted. If the value is not a Menu then it will be
+		 * type: 'submenu' can be omitted. If the value is not a then it will be
 		 * automatically converted to one using Menu.buildFromTemplate.
 		 */
 		submenu?: MenuItemConstructorOptions[] | Menu;
@@ -6940,7 +7585,7 @@ declare namespace Electron {
 		 */
 		disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other');
 		/**
-		 * The options which should be used for creating the new `BrowserWindow`.
+		 * The options which should be used for creating the new .
 		 */
 		options: Options;
 	}
@@ -6948,7 +7593,7 @@ declare namespace Electron {
 	interface NotificationConstructorOptions {
 		/**
 		 * A title for the notification, which will be shown at the top of the notification
-		 * window when it is shown
+		 * window when it is shown.
 		 */
 		title: string;
 		/**
@@ -6957,17 +7602,17 @@ declare namespace Electron {
 		subtitle?: string;
 		/**
 		 * The body text of the notification, which will be displayed below the title or
-		 * subtitle
+		 * subtitle.
 		 */
 		body: string;
 		/**
-		 * Whether or not to emit an OS notification noise when showing the notification
+		 * Whether or not to emit an OS notification noise when showing the notification.
 		 */
 		silent?: boolean;
 		/**
-		 * An icon to use in the notification
+		 * An icon to use in the notification.
 		 */
-		icon?: NativeImage;
+		icon?: string | NativeImage;
 		/**
 		 * Whether or not to add an inline reply option to the notification.
 		 */
@@ -6982,15 +7627,21 @@ declare namespace Electron {
 		sound?: string;
 		/**
 		 * Actions to add to the notification. Please read the available actions and
-		 * limitations in the NotificationAction documentation
+		 * limitations in the NotificationAction documentation.
 		 */
 		actions?: NotificationAction[];
+		/**
+		 * A custom title for the close button of an alert. An empty string will cause the
+		 * default localized text to be used.
+		 */
+		closeButtonText?: string;
 	}
 
 	interface OnBeforeRedirectDetails {
-		id: string;
+		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		redirectURL: string;
@@ -7015,6 +7666,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		uploadData: UploadData[];
@@ -7040,6 +7692,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		responseHeaders: ResponseHeaders;
@@ -7060,6 +7713,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		fromCache: boolean;
@@ -7089,6 +7743,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		responseHeaders: ResponseHeaders;
@@ -7112,6 +7767,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		requestHeaders: RequestHeaders;
@@ -7152,6 +7808,10 @@ declare namespace Electron {
 		 * Message to display above input boxes.
 		 */
 		message?: string;
+		/**
+		 * Create when packaged for the Mac App Store.
+		 */
+		securityScopedBookmarks?: boolean;
 	}
 
 	interface OpenExternalOptions {
@@ -7175,50 +7835,56 @@ declare namespace Electron {
 
 	interface Parameters {
 		/**
-		 * Specify the screen type to emulate (default: desktop)
+		 * Specify the screen type to emulate (default: desktop):
 		 */
 		screenPosition: ('desktop' | 'mobile');
 		/**
-		 * Set the emulated screen size (screenPosition == mobile)
+		 * Set the emulated screen size (screenPosition == mobile).
 		 */
 		screenSize: Size;
 		/**
 		 * Position the view on the screen (screenPosition == mobile) (default: {x: 0, y:
-		 * 0})
+		 * 0}).
 		 */
 		viewPosition: Point;
 		/**
 		 * Set the device scale factor (if zero defaults to original device scale factor)
-		 * (default: 0)
+		 * (default: 0).
 		 */
 		deviceScaleFactor: number;
 		/**
 		 * Set the emulated view size (empty means no override)
 		 */
 		viewSize: Size;
-		/**
-		 * Whether emulated view should be scaled down if necessary to fit into available
-		 * space (default: false)
-		 */
-		fitToView: boolean;
-		/**
-		 * Offset of the emulated view inside available space (not in fit to view mode)
-		 * (default: {x: 0, y: 0})
-		 */
-		offset: Point;
 		/**
 		 * Scale of emulated view inside available space (not in fit to view mode)
-		 * (default: 1)
+		 * (default: 1).
 		 */
 		scale: number;
 	}
 
+	interface Payment {
+		productIdentifier: string;
+		quantity: number;
+	}
+
+	interface PermissionRequestHandlerDetails {
+		/**
+		 * The url of the openExternal request.
+		 */
+		externalURL: string;
+	}
+
 	interface PluginCrashedEvent extends Event {
 		name: string;
 		version: string;
 	}
 
 	interface PopupOptions {
+		/**
+		 * Default is the focused window.
+		 */
+		window?: BrowserWindow;
 		/**
 		 * Default is the current mouse cursor position. Must be declared if y is declared.
 		 */
@@ -7227,16 +7893,15 @@ declare namespace Electron {
 		 * Default is the current mouse cursor position. Must be declared if x is declared.
 		 */
 		y?: number;
-		/**
-		 * Set to true to have this method return immediately called, false to return after
-		 * the menu has been selected or closed. Defaults to false.
-		 */
-		async?: boolean;
 		/**
 		 * The index of the menu item to be positioned under the mouse cursor at the
 		 * specified coordinates. Default is -1.
 		 */
 		positioningItem?: number;
+		/**
+		 * Called when menu is closed.
+		 */
+		callback?: () => void;
 	}
 
 	interface PrintOptions {
@@ -7295,7 +7960,7 @@ declare namespace Electron {
 		privateBytes: number;
 		/**
 		 * The amount of memory shared between processes, typically memory consumed by the
-		 * Electron code itself
+		 * Electron code itself.
 		 */
 		sharedBytes: number;
 	}
@@ -7309,7 +7974,7 @@ declare namespace Electron {
 
 	interface Provider {
 		/**
-		 * Returns Boolean
+		 * Returns Boolean.
 		 */
 		spellCheck: (text: string) => void;
 	}
@@ -7354,6 +8019,14 @@ declare namespace Electron {
 		secure?: boolean;
 	}
 
+	interface RegisterStreamProtocolRequest {
+		url: string;
+		headers: Headers;
+		referrer: string;
+		method: string;
+		uploadData: UploadData[];
+	}
+
 	interface RegisterStringProtocolRequest {
 		url: string;
 		referrer: string;
@@ -7401,7 +8074,7 @@ declare namespace Electron {
 		 */
 		width?: number;
 		/**
-		 * Defaults to the image's height
+		 * Defaults to the image's height.
 		 */
 		height?: number;
 		/**
@@ -7472,6 +8145,11 @@ declare namespace Electron {
 		 * Show the tags input box, defaults to true.
 		 */
 		showsTagField?: boolean;
+		/**
+		 * Create a when packaged for the Mac App Store. If this option is enabled and the
+		 * file doesn't already exist a blank file will be created at the chosen path.
+		 */
+		securityScopedBookmarks?: boolean;
 	}
 
 	interface Settings {
@@ -7484,7 +8162,7 @@ declare namespace Electron {
 		 * true to open the app as hidden. Defaults to false. The user can edit this
 		 * setting from the System Preferences so
 		 * app.getLoginItemStatus().wasOpenedAsHidden should be checked when the app is
-		 * opened to know the current value. This setting is only supported on macOS.
+		 * opened to know the current value. This setting is not available on .
 		 */
 		openAsHidden?: boolean;
 		/**
@@ -7585,7 +8263,7 @@ declare namespace Electron {
 		/**
 		 * Can be left, right or overlay.
 		 */
-		iconPosition: ('left' | 'right' | 'overlay');
+		iconPosition?: ('left' | 'right' | 'overlay');
 		/**
 		 * Function to call when the button is clicked.
 		 */
@@ -7608,8 +8286,8 @@ declare namespace Electron {
 	}
 
 	interface TouchBarConstructorOptions {
-		items: (TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer)[];
-		escapeItem?: TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer;
+		items: Array<TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer>;
+		escapeItem?: TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer | null;
 	}
 
 	interface TouchBarGroupConstructorOptions {
@@ -7652,15 +8330,15 @@ declare namespace Electron {
 
 	interface TouchBarScrubberConstructorOptions {
 		/**
-		 * An array of items to place in this scrubber
+		 * An array of items to place in this scrubber.
 		 */
 		items: ScrubberItem[];
 		/**
-		 * Called when the user taps an item that was not the last tapped item
+		 * Called when the user taps an item that was not the last tapped item.
 		 */
 		select: (selectedIndex: number) => void;
 		/**
-		 * Called when the user taps any item
+		 * Called when the user taps any item.
 		 */
 		highlight: (highlightedIndex: number) => void;
 		/**
@@ -7704,7 +8382,7 @@ declare namespace Electron {
 		 */
 		selectedIndex?: number;
 		/**
-		 * Called when the user selects a new segment
+		 * Called when the user selects a new segment.
 		 */
 		change: (selectedIndex: number, isSelected: boolean) => void;
 	}
@@ -7809,9 +8487,6 @@ declare namespace Electron {
 		finalUpdate: boolean;
 	}
 
-	interface Headers {
-	}
-
 	interface MediaFlags {
 		/**
 		 * Whether the media element has crashed.
@@ -7911,6 +8586,15 @@ declare namespace Electron {
 		 * session.
 		 */
 		partition?: string;
+		/**
+		 * When specified, web pages with the same affinity will run in the same renderer
+		 * process. Note that due to reusing the renderer process, certain webPreferences
+		 * options will also be shared between the web pages even when you specified
+		 * different values for them, including but not limited to preload, sandbox and
+		 * nodeIntegration. So it is suggested to use exact same webPreferences for web
+		 * pages with the same affinity.
+		 */
+		affinity?: string;
 		/**
 		 * The default zoom factor of the page, 3.0 represents 300%. Default is 1.0.
 		 */
@@ -7994,7 +8678,7 @@ declare namespace Electron {
 		defaultEncoding?: string;
 		/**
 		 * Whether to throttle animations and timers when the page becomes background. This
-		 * also affects the [Page Visibility API][#page-visibility]. Defaults to true.
+		 * also affects the . Defaults to true.
 		 */
 		backgroundThrottling?: boolean;
 		/**
@@ -8031,6 +8715,12 @@ declare namespace Electron {
 		 * alter the <webview>'s initial settings.
 		 */
 		webviewTag?: boolean;
+		/**
+		 * A list of strings that will be appended to process.argv in the renderer process
+		 * of this app. Useful for passing small bits of data down to renderer process
+		 * preload scripts.
+		 */
+		additionArguments?: string[];
 	}
 
 	interface DefaultFontFamily {
@@ -8108,6 +8798,7 @@ declare namespace NodeJS {
 
 		// Docs: http://electron.atom.io/docs/api/process
 
+		// ### BEGIN VSCODE MODIFICATION ###
 		// /**
 		//  * Emitted when Electron has loaded its internal initialization script and is
 		//  * beginning to load the web page or the main script. It can be used by the preload
@@ -8118,6 +8809,8 @@ declare namespace NodeJS {
 		// once(event: 'loaded', listener: Function): this;
 		// addListener(event: 'loaded', listener: Function): this;
 		// removeListener(event: 'loaded', listener: Function): this;
+		// ### END VSCODE MODIFICATION ###
+
 		/**
 		 * Causes the main thread of the current process crash.
 		 */
@@ -8160,8 +8853,8 @@ declare namespace NodeJS {
 		noAsar?: boolean;
 		/**
 		 * A Boolean that controls whether or not deprecation warnings are printed to
-		 * stderr. Setting this to true will silence deprecation warnings.  This property
-		 * is used instead of the --no-deprecation command line flag.
+		 * stderr. Setting this to true will silence deprecation warnings. This property is
+		 * used instead of the --no-deprecation command line flag.
 		 */
 		noDeprecation?: boolean;
 		/**
@@ -8170,21 +8863,21 @@ declare namespace NodeJS {
 		resourcesPath?: string;
 		/**
 		 * A Boolean that controls whether or not deprecation warnings will be thrown as
-		 * exceptions.  Setting this to true will throw errors for deprecations.  This
+		 * exceptions. Setting this to true will throw errors for deprecations. This
 		 * property is used instead of the --throw-deprecation command line flag.
 		 */
 		throwDeprecation?: boolean;
 		/**
 		 * A Boolean that controls whether or not deprecations printed to stderr include
-		 * their stack trace.  Setting this to true will print  stack traces for
+		 * their stack trace. Setting this to true will print stack traces for
 		 * deprecations. This property is instead of the --trace-deprecation command line
 		 * flag.
 		 */
 		traceDeprecation?: boolean;
 		/**
 		 * A Boolean that controls whether or not process warnings printed to stderr
-		 * include their stack trace.  Setting this to true will print stack traces for
-		 * process warnings (including deprecations).  This property is instead of the
+		 * include their stack trace. Setting this to true will print stack traces for
+		 * process warnings (including deprecations). This property is instead of the
 		 * --trace-warnings command line flag.
 		 */
 		traceProcessWarnings?: boolean;
@@ -8203,4 +8896,4 @@ declare namespace NodeJS {
 		electron: string;
 		chrome: string;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/typings/node.d.ts b/src/typings/node.d.ts
index 1b6661edd71..a1c8edf9d48 100644
--- a/src/typings/node.d.ts
+++ b/src/typings/node.d.ts
@@ -1,41 +1,62 @@
-// Type definitions for Node.js v7.x
+// Type definitions for Node.js 8.9.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
 //                 Parambir Singh <https://github.com/parambirs>
-//                 Roberto Desideri <https://github.com/RobDesideri>
 //                 Christian Vaagland Tellnes <https://github.com/tellnes>
 //                 Wilco Bakker <https://github.com/WilcoBakker>
-//                 Daniel Imms <https://github.com/Tyriar>
+//                 Nicolas Voigt <https://github.com/octo-sniffle>
+//                 Chigozirim C. <https://github.com/smac89>
+//                 Flarna <https://github.com/Flarna>
+//                 Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
+//                 wwwy3y3 <https://github.com/wwwy3y3>
+//                 Deividas Bakanas <https://github.com/DeividasBakanas>
+//                 Kelvin Jin <https://github.com/kjin>
+//                 Alvis HT Tang <https://github.com/alvis>
+//                 Oliver Joseph Ash <https://github.com/OliverJAsh>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+//                 Huw <https://github.com/hoo29>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-/************************************************
-*                                               *
-*               Node.js v7.x API                *
-*                                               *
-************************************************/
+// ### BEGIN VSCODE MODIFICATION ###
+// /** inspector module types */
+// /// <reference path="./inspector.d.ts" />
+// ### BEGIN VSCODE MODIFICATION ###
 
 // This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
 interface Console {
-	Console: NodeJS.ConsoleConstructor;
-	assert(value: any, message?: string, ...optionalParams: any[]): void;
-	dir(obj: any, options?: NodeJS.InspectOptions): void;
-	error(message?: any, ...optionalParams: any[]): void;
-	info(message?: any, ...optionalParams: any[]): void;
-	log(message?: any, ...optionalParams: any[]): void;
-	time(label: string): void;
-	timeEnd(label: string): void;
-	trace(message?: any, ...optionalParams: any[]): void;
-	warn(message?: any, ...optionalParams: any[]): void;
+    Console: NodeJS.ConsoleConstructor;
+    assert(value: any, message?: string, ...optionalParams: any[]): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
+    error(message?: any, ...optionalParams: any[]): void;
+    info(message?: any, ...optionalParams: any[]): void;
+    log(message?: any, ...optionalParams: any[]): void;
+    time(label: string): void;
+    timeEnd(label: string): void;
+    trace(message?: any, ...optionalParams: any[]): void;
+    warn(message?: any, ...optionalParams: any[]): void;
 }
 
 interface Error {
-	stack?: string;
+    stack?: string;
 }
 
+// Declare "static" methods in Error
 interface ErrorConstructor {
-	captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
-	stackTraceLimit: number;
+    /** Create .stack property on a target object */
+    captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
+    stackTraceLimit: number;
 }
 
 // compat for TypeScript 1.8
@@ -49,55 +70,85 @@ interface WeakSetConstructor { }
 // Forward-declare needed types from lib.es2015.d.ts (in case users are using `--lib es5`)
 interface Iterable<T> { }
 interface Iterator<T> {
-	next(value?: any): IteratorResult<T>;
+    next(value?: any): IteratorResult<T>;
 }
 interface IteratorResult<T> { }
 interface SymbolConstructor {
-	readonly iterator: symbol;
+    readonly iterator: symbol;
 }
 declare var Symbol: SymbolConstructor;
 
+// Node.js ESNEXT support
+interface String {
+    /** Removes whitespace from the left end of a string. */
+    trimLeft(): string;
+    /** Removes whitespace from the right end of a string. */
+    trimRight(): string;
+}
+
 /************************************************
 *                                               *
 *                   GLOBAL                      *
 *                                               *
 ************************************************/
 declare var process: NodeJS.Process;
-declare var global: any;
+declare var global: NodeJS.Global;
 declare var console: Console;
 
-// Don't use these!! :)
+// ### BEGIN VSCODE MODIFICATION ###
 // declare var __filename: string;
 // declare var __dirname: string;
 
 // declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+// declare namespace setTimeout {
+//     export function __promisify__(ms: number): Promise<void>;
+//     export function __promisify__<T>(ms: number, value: T): Promise<T>;
+// }
 // declare function clearTimeout(timeoutId: NodeJS.Timer): void;
 // declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
 // declare function clearInterval(intervalId: NodeJS.Timer): void;
+// ### END VSCODE MODIFICATION ###
+
 declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+declare namespace setImmediate {
+    export function __promisify__(): Promise<void>;
+    export function __promisify__<T>(value: T): Promise<T>;
+}
 declare function clearImmediate(immediateId: any): void;
 
+// TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
 interface NodeRequireFunction {
-	(id: string): any;
+    /* tslint:disable-next-line:callable-types */
+    (id: string): any;
 }
 
+// ### BEGIN VSCODE MODIFICATION ###
 // interface NodeRequire extends NodeRequireFunction {
 //     resolve(id: string): string;
 //     cache: any;
-//     extensions: any;
+//     extensions: NodeExtensions;
 //     main: NodeModule | undefined;
 // }
 
+// interface NodeExtensions {
+//     '.js': (m: NodeModule, filename: string) => any;
+//     '.json': (m: NodeModule, filename: string) => any;
+//     '.node': (m: NodeModule, filename: string) => any;
+//     [ext: string]: (m: NodeModule, filename: string) => any;
+// }
+
 // declare var require: NodeRequire;
+// ### END VSCODE MODIFICATION ###
 
 interface NodeModule {
-	exports: any;
-	require: NodeRequireFunction;
-	id: string;
-	filename: string;
-	loaded: boolean;
-	parent: NodeModule | null;
-	children: NodeModule[];
+    exports: any;
+    require: NodeRequireFunction;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: NodeModule | null;
+    children: NodeModule[];
+    paths: string[];
 }
 
 declare var module: NodeModule;
@@ -105,17 +156,16 @@ declare var module: NodeModule;
 // Same as module.exports
 declare var exports: any;
 declare var SlowBuffer: {
-	new(str: string, encoding?: string): Buffer;
-	new(size: number): Buffer;
-	new(size: Uint8Array): Buffer;
-	new(array: any[]): Buffer;
-	prototype: Buffer;
-	isBuffer(obj: any): boolean;
-	byteLength(string: string, encoding?: string): number;
-	concat(list: Buffer[], totalLength?: number): Buffer;
+    new(str: string, encoding?: string): Buffer;
+    new(size: number): Buffer;
+    new(size: Uint8Array): Buffer;
+    new(array: any[]): Buffer;
+    prototype: Buffer;
+    isBuffer(obj: any): boolean;
+    byteLength(string: string, encoding?: string): number;
+    concat(list: Buffer[], totalLength?: number): Buffer;
 };
 
-
 // Buffer class
 type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
 interface Buffer extends NodeBuffer { }
@@ -132,19 +182,19 @@ declare var Buffer: {
      * @param str String to store in buffer.
      * @param encoding encoding to use, optional.  Default is 'utf8'
      */
-	new(str: string, encoding?: string): Buffer;
+    new(str: string, encoding?: string): Buffer;
     /**
      * Allocates a new buffer of {size} octets.
      *
      * @param size count of octets to allocate.
      */
-	new(size: number): Buffer;
+    new(size: number): Buffer;
     /**
      * Allocates a new buffer containing the given {array} of octets.
      *
      * @param array The octets to store.
      */
-	new(array: Uint8Array): Buffer;
+    new(array: Uint8Array): Buffer;
     /**
      * Produces a Buffer backed by the same allocated memory as
      * the given {ArrayBuffer}.
@@ -152,26 +202,24 @@ declare var Buffer: {
      *
      * @param arrayBuffer The ArrayBuffer with which to share memory.
      */
-	new(arrayBuffer: ArrayBuffer): Buffer;
+    new(arrayBuffer: ArrayBuffer): Buffer;
     /**
      * Allocates a new buffer containing the given {array} of octets.
      *
      * @param array The octets to store.
      */
-	new(array: any[]): Buffer;
+    new(array: any[]): Buffer;
     /**
      * Copies the passed {buffer} data onto a new {Buffer} instance.
      *
      * @param buffer The buffer to copy.
      */
-	new(buffer: Buffer): Buffer;
-	prototype: Buffer;
+    new(buffer: Buffer): Buffer;
+    prototype: Buffer;
     /**
      * Allocates a new Buffer using an {array} of octets.
-     *
-     * @param array
      */
-	from(array: any[]): Buffer;
+    from(array: any[]): Buffer;
     /**
      * When passed a reference to the .buffer property of a TypedArray instance,
      * the newly created Buffer will share the same allocated memory as the TypedArray.
@@ -179,45 +227,39 @@ declare var Buffer: {
      * within the {arrayBuffer} that will be shared by the Buffer.
      *
      * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
-     * @param byteOffset
-     * @param length
      */
-	from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
+    from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
      * Copies the passed {buffer} data onto a new Buffer instance.
-     *
-     * @param buffer
      */
-	from(buffer: Buffer): Buffer;
+    from(buffer: Buffer): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
      * If not provided, {encoding} defaults to 'utf8'.
-     *
-     * @param str
      */
-	from(str: string, encoding?: string): Buffer;
+    from(str: string, encoding?: string): Buffer;
     /**
      * Returns true if {obj} is a Buffer
      *
      * @param obj object to test.
      */
-	isBuffer(obj: any): obj is Buffer;
+    isBuffer(obj: any): obj is Buffer;
     /**
      * Returns true if {encoding} is a valid encoding argument.
      * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
      *
      * @param encoding string to test.
      */
-	isEncoding(encoding: string): boolean;
+    isEncoding(encoding: string): boolean;
     /**
      * Gives the actual byte length of a string. encoding defaults to 'utf8'.
      * This is not the same as String.prototype.length since that returns the number of characters in a string.
      *
-     * @param string string to test.
+     * @param string string to test. (TypedArray is also allowed, but it is only available starting ES2017)
      * @param encoding encoding used to evaluate (defaults to 'utf8')
      */
-	byteLength(string: string, encoding?: string): number;
+    byteLength(string: string | Buffer | DataView | ArrayBuffer, encoding?: string): number;
     /**
      * Returns a buffer which is the result of concatenating all the buffers in the list together.
      *
@@ -229,11 +271,11 @@ declare var Buffer: {
      * @param totalLength Total length of the buffers when concatenated.
      *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
      */
-	concat(list: Buffer[], totalLength?: number): Buffer;
+    concat(list: Buffer[], totalLength?: number): Buffer;
     /**
      * The same as buf1.compare(buf2).
      */
-	compare(buf1: Buffer, buf2: Buffer): number;
+    compare(buf1: Buffer, buf2: Buffer): number;
     /**
      * Allocates a new buffer of {size} octets.
      *
@@ -242,21 +284,25 @@ declare var Buffer: {
      *    If parameter is omitted, buffer will be filled with zeros.
      * @param encoding encoding used for call to buf.fill while initalizing
      */
-	alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
+    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
     /**
      * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
      * of the newly created Buffer are unknown and may contain sensitive data.
      *
      * @param size count of octets to allocate
      */
-	allocUnsafe(size: number): Buffer;
+    allocUnsafe(size: number): Buffer;
     /**
      * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
      * of the newly created Buffer are unknown and may contain sensitive data.
      *
      * @param size count of octets to allocate
      */
-	allocUnsafeSlow(size: number): Buffer;
+    allocUnsafeSlow(size: number): Buffer;
+    /**
+     * This is the number of bytes used to determine the size of pre-allocated, internal Buffer instances used for pooling. This value may be modified.
+     */
+    poolSize: number;
 };
 
 /************************************************
@@ -265,273 +311,501 @@ declare var Buffer: {
 *                                               *
 ************************************************/
 declare namespace NodeJS {
-	export interface InspectOptions {
-		showHidden?: boolean;
-		depth?: number | null;
-		colors?: boolean;
-		customInspect?: boolean;
-		showProxy?: boolean;
-		maxArrayLength?: number | null;
-		breakLength?: number;
-	}
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+    }
 
-	export interface ConsoleConstructor {
-		prototype: Console;
-		new(stdout: WritableStream, stderr?: WritableStream): Console;
-	}
+    export interface ConsoleConstructor {
+        prototype: Console;
+        new(stdout: WritableStream, stderr?: WritableStream): Console;
+    }
 
-	export interface ErrnoException extends Error {
-		errno?: number;
-		code?: string;
-		path?: string;
-		syscall?: string;
-		stack?: string;
-	}
+    export interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
 
-	export class EventEmitter {
-		addListener(event: string | symbol, listener: Function): this;
-		on(event: string | symbol, listener: Function): this;
-		once(event: string | symbol, listener: Function): this;
-		removeListener(event: string | symbol, listener: Function): this;
-		removeAllListeners(event?: string | symbol): this;
-		setMaxListeners(n: number): this;
-		getMaxListeners(): number;
-		listeners(event: string | symbol): Function[];
-		emit(event: string | symbol, ...args: any[]): boolean;
-		listenerCount(type: string | symbol): number;
-		// Added in Node 6...
-		prependListener(event: string | symbol, listener: Function): this;
-		prependOnceListener(event: string | symbol, listener: Function): this;
-		eventNames(): (string | symbol)[];
-	}
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
 
-	export interface ReadableStream extends EventEmitter {
-		readable: boolean;
-		read(size?: number): string | Buffer;
-		setEncoding(encoding: string | null): this;
-		pause(): this;
-		resume(): this;
-		isPaused(): boolean;
-		pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
-		unpipe<T extends WritableStream>(destination?: T): this;
-		unshift(chunk: string): void;
-		unshift(chunk: Buffer): void;
-		wrap(oldStream: ReadableStream): ReadableStream;
-	}
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
 
-	export interface WritableStream extends EventEmitter {
-		writable: boolean;
-		write(buffer: Buffer | string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-	}
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
 
-	export interface ReadWriteStream extends ReadableStream, WritableStream { }
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
 
-	export interface Events extends EventEmitter { }
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
 
-	export interface Domain extends Events {
-		run(fn: Function): void;
-		add(emitter: Events): void;
-		remove(emitter: Events): void;
-		bind(cb: (err: Error, data: any) => any): any;
-		intercept(cb: (data: any) => any): any;
-		dispose(): void;
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
 
-		addListener(event: string, listener: Function): this;
-		on(event: string, listener: Function): this;
-		once(event: string, listener: Function): this;
-		removeListener(event: string, listener: Function): this;
-		removeAllListeners(event?: string): this;
-	}
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
 
-	export interface MemoryUsage {
-		rss: number;
-		heapTotal: number;
-		heapUsed: number;
-	}
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
 
-	export interface CpuUsage {
-		user: number;
-		system: number;
-	}
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
 
-	export interface ProcessVersions {
-		http_parser: string;
-		node: string;
-		v8: string;
-		ares: string;
-		uv: string;
-		zlib: string;
-		modules: string;
-		openssl: string;
-	}
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
 
-	type Platform = 'aix'
-		| 'android'
-		| 'darwin'
-		| 'freebsd'
-		| 'linux'
-		| 'openbsd'
-		| 'sunos'
-		| 'win32';
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
 
-	export interface Socket extends ReadWriteStream {
-		isTTY?: true;
-	}
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
 
-	export interface WriteStream extends Socket {
-		columns?: number;
-		rows?: number;
-	}
-	export interface ReadStream extends Socket {
-		isRaw?: boolean;
-		setRawMode?(mode: boolean): void;
-	}
+    export interface ErrnoException extends Error {
+        errno?: number;
+        code?: string;
+        path?: string;
+        syscall?: string;
+        stack?: string;
+    }
 
-	export interface Process extends EventEmitter {
-		stdout: WriteStream;
-		stderr: WriteStream;
-		stdin: ReadStream;
-		openStdin(): Socket;
-		argv: string[];
-		argv0: string;
-		execArgv: string[];
-		execPath: string;
-		abort(): void;
-		chdir(directory: string): void;
-		cwd(): string;
-		emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
-		env: any;
-		exit(code?: number): void;
-		exitCode: number;
-		getgid(): number;
-		setgid(id: number): void;
-		setgid(id: string): void;
-		getuid(): number;
-		setuid(id: number): void;
-		setuid(id: string): void;
-		version: string;
-		versions: ProcessVersions;
-		config: {
-			target_defaults: {
-				cflags: any[];
-				default_configuration: string;
-				defines: string[];
-				include_dirs: string[];
-				libraries: string[];
-			};
-			variables: {
-				clang: number;
-				host_arch: string;
-				node_install_npm: boolean;
-				node_install_waf: boolean;
-				node_prefix: string;
-				node_shared_openssl: boolean;
-				node_shared_v8: boolean;
-				node_shared_zlib: boolean;
-				node_use_dtrace: boolean;
-				node_use_etw: boolean;
-				node_use_openssl: boolean;
-				target_arch: string;
-				v8_no_strict_aliasing: number;
-				v8_use_snapshot: boolean;
-				visibility: string;
-			};
-		};
-		kill(pid: number, signal?: string | number): void;
-		pid: number;
-		title: string;
-		arch: string;
-		platform: Platform;
-		mainModule?: NodeModule;
-		memoryUsage(): MemoryUsage;
-		cpuUsage(previousValue?: CpuUsage): CpuUsage;
-		nextTick(callback: Function, ...args: any[]): void;
-		umask(mask?: number): number;
-		uptime(): number;
-		hrtime(time?: [number, number]): [number, number];
-		domain: Domain;
+    export class EventEmitter {
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string | symbol): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string | symbol): Function[];
+        emit(event: string | symbol, ...args: any[]): boolean;
+        listenerCount(type: string | symbol): number;
+        // Added in Node 6...
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        eventNames(): Array<string | symbol>;
+    }
 
-		// Worker
-		send?(message: any, sendHandle?: any): void;
-		disconnect(): void;
-		connected: boolean;
-	}
+    export interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: string): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends WritableStream>(destination?: T): this;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: ReadableStream): this;
+    }
 
-	export interface Global {
-		Array: typeof Array;
-		ArrayBuffer: typeof ArrayBuffer;
-		Boolean: typeof Boolean;
-		Buffer: typeof Buffer;
-		DataView: typeof DataView;
-		Date: typeof Date;
-		Error: typeof Error;
-		EvalError: typeof EvalError;
-		Float32Array: typeof Float32Array;
-		Float64Array: typeof Float64Array;
-		Function: typeof Function;
-		GLOBAL: Global;
-		Infinity: typeof Infinity;
-		Int16Array: typeof Int16Array;
-		Int32Array: typeof Int32Array;
-		Int8Array: typeof Int8Array;
-		Intl: typeof Intl;
-		JSON: typeof JSON;
-		Map: MapConstructor;
-		Math: typeof Math;
-		NaN: typeof NaN;
-		Number: typeof Number;
-		Object: typeof Object;
-		Promise: Function;
-		RangeError: typeof RangeError;
-		ReferenceError: typeof ReferenceError;
-		RegExp: typeof RegExp;
-		Set: SetConstructor;
-		String: typeof String;
-		Symbol: Function;
-		SyntaxError: typeof SyntaxError;
-		TypeError: typeof TypeError;
-		URIError: typeof URIError;
-		Uint16Array: typeof Uint16Array;
-		Uint32Array: typeof Uint32Array;
-		Uint8Array: typeof Uint8Array;
-		Uint8ClampedArray: Function;
-		WeakMap: WeakMapConstructor;
-		WeakSet: WeakSetConstructor;
-		clearImmediate: (immediateId: any) => void;
-		clearInterval: (intervalId: NodeJS.Timer) => void;
-		clearTimeout: (timeoutId: NodeJS.Timer) => void;
-		console: typeof console;
-		decodeURI: typeof decodeURI;
-		decodeURIComponent: typeof decodeURIComponent;
-		encodeURI: typeof encodeURI;
-		encodeURIComponent: typeof encodeURIComponent;
-		escape: (str: string) => string;
-		eval: typeof eval;
-		global: Global;
-		isFinite: typeof isFinite;
-		isNaN: typeof isNaN;
-		parseFloat: typeof parseFloat;
-		parseInt: typeof parseInt;
-		process: Process;
-		root: Global;
-		setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
-		setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
-		setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
-		undefined: typeof undefined;
-		unescape: (str: string) => string;
-		gc: () => void;
-		v8debug?: any;
-	}
+    export interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Buffer | string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(cb?: Function): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+    }
 
-	export interface Timer {
-		ref(): void;
-		unref(): void;
-	}
+    export interface ReadWriteStream extends ReadableStream, WritableStream { }
+
+    export interface Events extends EventEmitter { }
+
+    export interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string): this;
+    }
+
+    export interface MemoryUsage {
+        rss: number;
+        heapTotal: number;
+        heapUsed: number;
+    }
+
+    export interface CpuUsage {
+        user: number;
+        system: number;
+    }
+
+    export interface ProcessVersions {
+        http_parser: string;
+        node: string;
+        v8: string;
+        ares: string;
+        uv: string;
+        zlib: string;
+        modules: string;
+        openssl: string;
+    }
+
+    type Platform = 'aix'
+        | 'android'
+        | 'darwin'
+        | 'freebsd'
+        | 'linux'
+        | 'openbsd'
+        | 'sunos'
+        | 'win32'
+        | 'cygwin';
+
+    type Signals =
+        "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" |
+        "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" |
+        "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" |
+        "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
+
+    type BeforeExitListener = (code: number) => void;
+    type DisconnectListener = () => void;
+    type ExitListener = (code: number) => void;
+    type RejectionHandledListener = (promise: Promise<any>) => void;
+    type UncaughtExceptionListener = (error: Error) => void;
+    type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
+    type WarningListener = (warning: Error) => void;
+    type MessageListener = (message: any, sendHandle: any) => void;
+    type SignalsListener = () => void;
+    type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+
+    export interface Socket extends ReadWriteStream {
+        isTTY?: true;
+    }
+
+    export interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
+    export interface WriteStream extends Socket {
+        columns?: number;
+        rows?: number;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        _destroy(err: Error, callback: Function): void;
+        _final(callback: Function): void;
+        setDefaultEncoding(encoding: string): this;
+        cork(): void;
+        uncork(): void;
+        destroy(error?: Error): void;
+    }
+    export interface ReadStream extends Socket {
+        isRaw?: boolean;
+        setRawMode?(mode: boolean): void;
+        _read(size: number): void;
+        _destroy(err: Error, callback: Function): void;
+        push(chunk: any, encoding?: string): boolean;
+        destroy(error?: Error): void;
+    }
+
+    export interface Process extends EventEmitter {
+        stdout: WriteStream;
+        stderr: WriteStream;
+        stdin: ReadStream;
+        openStdin(): Socket;
+        argv: string[];
+        argv0: string;
+        execArgv: string[];
+        execPath: string;
+        abort(): void;
+        chdir(directory: string): void;
+        cwd(): string;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
+        env: ProcessEnv;
+        exit(code?: number): never;
+        exitCode: number;
+        getgid(): number;
+        setgid(id: number | string): void;
+        getuid(): number;
+        setuid(id: number | string): void;
+        geteuid(): number;
+        seteuid(id: number | string): void;
+        getegid(): number;
+        setegid(id: number | string): void;
+        getgroups(): number[];
+        setgroups(groups: Array<string | number>): void;
+        version: string;
+        versions: ProcessVersions;
+        config: {
+            target_defaults: {
+                cflags: any[];
+                default_configuration: string;
+                defines: string[];
+                include_dirs: string[];
+                libraries: string[];
+            };
+            variables: {
+                clang: number;
+                host_arch: string;
+                node_install_npm: boolean;
+                node_install_waf: boolean;
+                node_prefix: string;
+                node_shared_openssl: boolean;
+                node_shared_v8: boolean;
+                node_shared_zlib: boolean;
+                node_use_dtrace: boolean;
+                node_use_etw: boolean;
+                node_use_openssl: boolean;
+                target_arch: string;
+                v8_no_strict_aliasing: number;
+                v8_use_snapshot: boolean;
+                visibility: string;
+            };
+        };
+        kill(pid: number, signal?: string | number): void;
+        pid: number;
+        title: string;
+        arch: string;
+        platform: Platform;
+        mainModule?: NodeModule;
+        memoryUsage(): MemoryUsage;
+        cpuUsage(previousValue?: CpuUsage): CpuUsage;
+        nextTick(callback: Function, ...args: any[]): void;
+        umask(mask?: number): number;
+        uptime(): number;
+        hrtime(time?: [number, number]): [number, number];
+        domain: Domain;
+
+        // Worker
+        send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
+
+        /**
+         * EventEmitter
+         *   1. beforeExit
+         *   2. disconnect
+         *   3. exit
+         *   4. message
+         *   5. rejectionHandled
+         *   6. uncaughtException
+         *   7. unhandledRejection
+         *   8. warning
+         *   9. message
+         *  10. <All OS Signals>
+         *  11. newListener/removeListener inherited from EventEmitter
+         */
+        addListener(event: "beforeExit", listener: BeforeExitListener): this;
+        addListener(event: "disconnect", listener: DisconnectListener): this;
+        addListener(event: "exit", listener: ExitListener): this;
+        addListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        addListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        addListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        addListener(event: "warning", listener: WarningListener): this;
+        addListener(event: "message", listener: MessageListener): this;
+        addListener(event: Signals, listener: SignalsListener): this;
+        addListener(event: "newListener", listener: NewListenerListener): this;
+        addListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        emit(event: "beforeExit", code: number): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "exit", code: number): boolean;
+        emit(event: "rejectionHandled", promise: Promise<any>): boolean;
+        emit(event: "uncaughtException", error: Error): boolean;
+        emit(event: "unhandledRejection", reason: any, promise: Promise<any>): boolean;
+        emit(event: "warning", warning: Error): boolean;
+        emit(event: "message", message: any, sendHandle: any): this;
+        emit(event: Signals): boolean;
+        emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
+        emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
+
+        on(event: "beforeExit", listener: BeforeExitListener): this;
+        on(event: "disconnect", listener: DisconnectListener): this;
+        on(event: "exit", listener: ExitListener): this;
+        on(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        on(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        on(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        on(event: "warning", listener: WarningListener): this;
+        on(event: "message", listener: MessageListener): this;
+        on(event: Signals, listener: SignalsListener): this;
+        on(event: "newListener", listener: NewListenerListener): this;
+        on(event: "removeListener", listener: RemoveListenerListener): this;
+
+        once(event: "beforeExit", listener: BeforeExitListener): this;
+        once(event: "disconnect", listener: DisconnectListener): this;
+        once(event: "exit", listener: ExitListener): this;
+        once(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        once(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        once(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        once(event: "warning", listener: WarningListener): this;
+        once(event: "message", listener: MessageListener): this;
+        once(event: Signals, listener: SignalsListener): this;
+        once(event: "newListener", listener: NewListenerListener): this;
+        once(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependListener(event: "disconnect", listener: DisconnectListener): this;
+        prependListener(event: "exit", listener: ExitListener): this;
+        prependListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependListener(event: "warning", listener: WarningListener): this;
+        prependListener(event: "message", listener: MessageListener): this;
+        prependListener(event: Signals, listener: SignalsListener): this;
+        prependListener(event: "newListener", listener: NewListenerListener): this;
+        prependListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependOnceListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependOnceListener(event: "disconnect", listener: DisconnectListener): this;
+        prependOnceListener(event: "exit", listener: ExitListener): this;
+        prependOnceListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependOnceListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependOnceListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependOnceListener(event: "warning", listener: WarningListener): this;
+        prependOnceListener(event: "message", listener: MessageListener): this;
+        prependOnceListener(event: Signals, listener: SignalsListener): this;
+        prependOnceListener(event: "newListener", listener: NewListenerListener): this;
+        prependOnceListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        listeners(event: "beforeExit"): BeforeExitListener[];
+        listeners(event: "disconnect"): DisconnectListener[];
+        listeners(event: "exit"): ExitListener[];
+        listeners(event: "rejectionHandled"): RejectionHandledListener[];
+        listeners(event: "uncaughtException"): UncaughtExceptionListener[];
+        listeners(event: "unhandledRejection"): UnhandledRejectionListener[];
+        listeners(event: "warning"): WarningListener[];
+        listeners(event: "message"): MessageListener[];
+        listeners(event: Signals): SignalsListener[];
+        listeners(event: "newListener"): NewListenerListener[];
+        listeners(event: "removeListener"): RemoveListenerListener[];
+    }
+
+    export interface Global {
+        Array: typeof Array;
+        ArrayBuffer: typeof ArrayBuffer;
+        Boolean: typeof Boolean;
+        Buffer: typeof Buffer;
+        DataView: typeof DataView;
+        Date: typeof Date;
+        Error: typeof Error;
+        EvalError: typeof EvalError;
+        Float32Array: typeof Float32Array;
+        Float64Array: typeof Float64Array;
+        Function: typeof Function;
+        GLOBAL: Global;
+        Infinity: typeof Infinity;
+        Int16Array: typeof Int16Array;
+        Int32Array: typeof Int32Array;
+        Int8Array: typeof Int8Array;
+        Intl: typeof Intl;
+        JSON: typeof JSON;
+        Map: MapConstructor;
+        Math: typeof Math;
+        NaN: typeof NaN;
+        Number: typeof Number;
+        Object: typeof Object;
+        Promise: Function;
+        RangeError: typeof RangeError;
+        ReferenceError: typeof ReferenceError;
+        RegExp: typeof RegExp;
+        Set: SetConstructor;
+        String: typeof String;
+        Symbol: Function;
+        SyntaxError: typeof SyntaxError;
+        TypeError: typeof TypeError;
+        URIError: typeof URIError;
+        Uint16Array: typeof Uint16Array;
+        Uint32Array: typeof Uint32Array;
+        Uint8Array: typeof Uint8Array;
+        Uint8ClampedArray: Function;
+        WeakMap: WeakMapConstructor;
+        WeakSet: WeakSetConstructor;
+        clearImmediate: (immediateId: any) => void;
+        clearInterval: (intervalId: NodeJS.Timer) => void;
+        clearTimeout: (timeoutId: NodeJS.Timer) => void;
+        console: typeof console;
+        decodeURI: typeof decodeURI;
+        decodeURIComponent: typeof decodeURIComponent;
+        encodeURI: typeof encodeURI;
+        encodeURIComponent: typeof encodeURIComponent;
+        escape: (str: string) => string;
+        eval: typeof eval;
+        global: Global;
+        isFinite: typeof isFinite;
+        isNaN: typeof isNaN;
+        parseFloat: typeof parseFloat;
+        parseInt: typeof parseInt;
+        process: Process;
+        root: Global;
+        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
+        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        undefined: typeof undefined;
+        unescape: (str: string) => string;
+        gc: () => void;
+        v8debug?: any;
+    }
+
+    export interface Timer {
+        ref(): void;
+        unref(): void;
+    }
+
+    class Module {
+        static runMain(): void;
+        static wrap(code: string): string;
+
+        static Module: typeof Module;
+
+        exports: any;
+        require: NodeRequireFunction;
+        id: string;
+        filename: string;
+        loaded: boolean;
+        parent: Module | null;
+        children: Module[];
+        paths: string[];
+
+        constructor(id: string, parent?: Module);
+    }
 }
 
 interface IterableIterator<T> { }
@@ -540,59 +814,59 @@ interface IterableIterator<T> { }
  * @deprecated
  */
 interface NodeBuffer extends Uint8Array {
-	write(string: string, offset?: number, length?: number, encoding?: string): number;
-	toString(encoding?: string, start?: number, end?: number): string;
-	toJSON(): { type: 'Buffer', data: any[] };
-	equals(otherBuffer: Buffer): boolean;
-	compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
-	copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
-	slice(start?: number, end?: number): Buffer;
-	writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readUInt8(offset: number, noAssert?: boolean): number;
-	readUInt16LE(offset: number, noAssert?: boolean): number;
-	readUInt16BE(offset: number, noAssert?: boolean): number;
-	readUInt32LE(offset: number, noAssert?: boolean): number;
-	readUInt32BE(offset: number, noAssert?: boolean): number;
-	readInt8(offset: number, noAssert?: boolean): number;
-	readInt16LE(offset: number, noAssert?: boolean): number;
-	readInt16BE(offset: number, noAssert?: boolean): number;
-	readInt32LE(offset: number, noAssert?: boolean): number;
-	readInt32BE(offset: number, noAssert?: boolean): number;
-	readFloatLE(offset: number, noAssert?: boolean): number;
-	readFloatBE(offset: number, noAssert?: boolean): number;
-	readDoubleLE(offset: number, noAssert?: boolean): number;
-	readDoubleBE(offset: number, noAssert?: boolean): number;
-	swap16(): Buffer;
-	swap32(): Buffer;
-	swap64(): Buffer;
-	writeUInt8(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt8(value: number, offset: number, noAssert?: boolean): number;
-	writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
-	writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
-	writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
-	writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
-	writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
-	fill(value: any, offset?: number, end?: number): this;
-	indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-	lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-	entries(): IterableIterator<[number, number]>;
-	includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
-	keys(): IterableIterator<number>;
-	values(): IterableIterator<number>;
+    write(string: string, offset?: number, length?: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): { type: 'Buffer', data: any[] };
+    equals(otherBuffer: Buffer): boolean;
+    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    swap16(): Buffer;
+    swap32(): Buffer;
+    swap64(): Buffer;
+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
+    fill(value: any, offset?: number, end?: number): this;
+    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
 }
 
 /************************************************
@@ -601,205 +875,269 @@ interface NodeBuffer extends Uint8Array {
 *                                               *
 ************************************************/
 declare module "buffer" {
-	export var INSPECT_MAX_BYTES: number;
-	var BuffType: typeof Buffer;
-	var SlowBuffType: typeof SlowBuffer;
-	export { BuffType as Buffer, SlowBuffType as SlowBuffer };
+    export var INSPECT_MAX_BYTES: number;
+    var BuffType: typeof Buffer;
+    var SlowBuffType: typeof SlowBuffer;
+    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
 }
 
 declare module "querystring" {
-	export interface StringifyOptions {
-		encodeURIComponent?: Function;
-	}
+    export interface StringifyOptions {
+        encodeURIComponent?: Function;
+    }
 
-	export interface ParseOptions {
-		maxKeys?: number;
-		decodeURIComponent?: Function;
-	}
+    export interface ParseOptions {
+        maxKeys?: number;
+        decodeURIComponent?: Function;
+    }
 
-	export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
-	export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): any;
-	export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
-	export function escape(str: string): string;
-	export function unescape(str: string): string;
+    interface ParsedUrlQuery { [key: string]: string | string[]; }
+
+    export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
+    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
+    export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
+    export function escape(str: string): string;
+    export function unescape(str: string): string;
 }
 
 declare module "events" {
-	class internal extends NodeJS.EventEmitter { }
+    class internal extends NodeJS.EventEmitter { }
 
-	namespace internal {
-		export class EventEmitter extends internal {
-			static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
-			static defaultMaxListeners: number;
+    namespace internal {
+        export class EventEmitter extends internal {
+            static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
+            static defaultMaxListeners: number;
 
-			addListener(event: string | symbol, listener: Function): this;
-			on(event: string | symbol, listener: Function): this;
-			once(event: string | symbol, listener: Function): this;
-			prependListener(event: string | symbol, listener: Function): this;
-			prependOnceListener(event: string | symbol, listener: Function): this;
-			removeListener(event: string | symbol, listener: Function): this;
-			removeAllListeners(event?: string | symbol): this;
-			setMaxListeners(n: number): this;
-			getMaxListeners(): number;
-			listeners(event: string | symbol): Function[];
-			emit(event: string | symbol, ...args: any[]): boolean;
-			eventNames(): (string | symbol)[];
-			listenerCount(type: string | symbol): number;
-		}
-	}
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            on(event: string | symbol, listener: (...args: any[]) => void): this;
+            once(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeAllListeners(event?: string | symbol): this;
+            setMaxListeners(n: number): this;
+            getMaxListeners(): number;
+            listeners(event: string | symbol): Function[];
+            emit(event: string | symbol, ...args: any[]): boolean;
+            eventNames(): Array<string | symbol>;
+            listenerCount(type: string | symbol): number;
+        }
+    }
 
-	export = internal;
+    export = internal;
 }
 
 declare module "http" {
-	import * as events from "events";
-	import * as net from "net";
-	import * as stream from "stream";
+    import * as events from "events";
+    import * as net from "net";
+    import * as stream from "stream";
+    import { URL } from "url";
 
-	export interface RequestOptions {
-		protocol?: string;
-		host?: string;
-		hostname?: string;
-		family?: number;
-		port?: number;
-		localAddress?: string;
-		socketPath?: string;
-		method?: string;
-		path?: string;
-		headers?: { [key: string]: any };
-		auth?: string;
-		agent?: Agent | boolean;
-		timeout?: number;
-	}
+    // incoming headers will never contain number
+    export interface IncomingHttpHeaders {
+        'accept'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-headers'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'date'?: string;
+        'expires'?: string;
+        'host'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'public-key-pins'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'tk'?: string;
+        'upgrade'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
 
-	export interface Server extends net.Server {
-		setTimeout(msecs: number, callback: Function): void;
-		maxHeadersCount: number;
-		timeout: number;
-		listening: boolean;
-	}
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    export interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
+    export interface ClientRequestArgs {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number | string;
+        defaultPort?: number | string;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: OutgoingHttpHeaders;
+        auth?: string;
+        agent?: Agent | boolean;
+        _defaultAgent?: Agent;
+        timeout?: number;
+        // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L278
+        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: net.Socket) => void) => net.Socket;
+    }
+
+    export class Server extends net.Server {
+        constructor(requestListener?: (req: IncomingMessage, res: ServerResponse) => void);
+
+        setTimeout(msecs?: number, callback?: () => void): this;
+        setTimeout(callback: () => void): this;
+        maxHeadersCount: number;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
     /**
      * @deprecated Use IncomingMessage
      */
-	export interface ServerRequest extends IncomingMessage {
-		connection: net.Socket;
-	}
-	export interface ServerResponse extends stream.Writable {
-		// Extended base methods
-		write(buffer: Buffer): boolean;
-		write(buffer: Buffer, cb?: Function): boolean;
-		write(str: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, fd?: string): boolean;
+    export class ServerRequest extends IncomingMessage {
+        connection: net.Socket;
+    }
 
-		writeContinue(): void;
-		writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-		writeHead(statusCode: number, headers?: any): void;
-		statusCode: number;
-		statusMessage: string;
-		headersSent: boolean;
-		setHeader(name: string, value: string | string[]): void;
-		setTimeout(msecs: number, callback: Function): ServerResponse;
-		sendDate: boolean;
-		getHeader(name: string): string;
-		removeHeader(name: string): void;
-		write(chunk: any, encoding?: string): any;
-		addTrailers(headers: any): void;
-		finished: boolean;
+    // https://github.com/nodejs/node/blob/master/lib/_http_outgoing.js
+    export class OutgoingMessage extends stream.Writable {
+        upgrading: boolean;
+        chunkedEncoding: boolean;
+        shouldKeepAlive: boolean;
+        useChunkedEncodingByDefault: boolean;
+        sendDate: boolean;
+        finished: boolean;
+        headersSent: boolean;
+        connection: net.Socket;
 
-		// Extended base methods
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-		end(data?: any, encoding?: string): void;
-	}
-	export interface ClientRequest extends stream.Writable {
-		// Extended base methods
-		write(buffer: Buffer): boolean;
-		write(buffer: Buffer, cb?: Function): boolean;
-		write(str: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, fd?: string): boolean;
+        constructor();
 
-		write(chunk: any, encoding?: string): void;
-		abort(): void;
-		setTimeout(timeout: number, callback?: Function): void;
-		setNoDelay(noDelay?: boolean): void;
-		setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+        setTimeout(msecs: number, callback?: () => void): this;
+        destroy(error: Error): void;
+        setHeader(name: string, value: number | string | string[]): void;
+        getHeader(name: string): number | string | string[] | undefined;
+        getHeaders(): OutgoingHttpHeaders;
+        getHeaderNames(): string[];
+        hasHeader(name: string): boolean;
+        removeHeader(name: string): void;
+        addTrailers(headers: OutgoingHttpHeaders | Array<[string, string]>): void;
+        flushHeaders(): void;
+    }
 
-		setHeader(name: string, value: string | string[]): void;
-		getHeader(name: string): string;
-		removeHeader(name: string): void;
-		addTrailers(headers: any): void;
+    // https://github.com/nodejs/node/blob/master/lib/_http_server.js#L108-L256
+    export class ServerResponse extends OutgoingMessage {
+        statusCode: number;
+        statusMessage: string;
 
-		// Extended base methods
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-		end(data?: any, encoding?: string): void;
-	}
-	export interface IncomingMessage extends stream.Readable {
-		httpVersion: string;
-		httpVersionMajor: number;
-		httpVersionMinor: number;
-		connection: net.Socket;
-		headers: any;
-		rawHeaders: string[];
-		trailers: any;
-		rawTrailers: any;
-		setTimeout(msecs: number, callback: Function): NodeJS.Timer;
+        constructor(req: IncomingMessage);
+
+        assignSocket(socket: net.Socket): void;
+        detachSocket(socket: net.Socket): void;
+        // https://github.com/nodejs/node/blob/master/test/parallel/test-http-write-callbacks.js#L53
+        // no args in writeContinue callback
+        writeContinue(callback?: () => void): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L77
+    export class ClientRequest extends OutgoingMessage {
+        connection: net.Socket;
+        socket: net.Socket;
+        aborted: number;
+
+        constructor(url: string | URL | ClientRequestArgs, cb?: (res: IncomingMessage) => void);
+
+        abort(): void;
+        onSocket(socket: net.Socket): void;
+        setTimeout(timeout: number, callback?: () => void): this;
+        setNoDelay(noDelay?: boolean): void;
+        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+    }
+
+    export class IncomingMessage extends stream.Readable {
+        constructor(socket: net.Socket);
+
+        httpVersion: string;
+        httpVersionMajor: number;
+        httpVersionMinor: number;
+        connection: net.Socket;
+        headers: IncomingHttpHeaders;
+        rawHeaders: string[];
+        trailers: { [key: string]: string | undefined };
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback: () => void): this;
         /**
          * Only valid for request obtained from http.Server.
          */
-		method?: string;
+        method?: string;
         /**
          * Only valid for request obtained from http.Server.
          */
-		url?: string;
+        url?: string;
         /**
          * Only valid for response obtained from http.ClientRequest.
          */
-		statusCode?: number;
+        statusCode?: number;
         /**
          * Only valid for response obtained from http.ClientRequest.
          */
-		statusMessage?: string;
-		socket: net.Socket;
-		destroy(error?: Error): void;
-	}
+        statusMessage?: string;
+        socket: net.Socket;
+        destroy(error?: Error): void;
+    }
+
     /**
      * @deprecated Use IncomingMessage
      */
-	export interface ClientResponse extends IncomingMessage { }
+    export class ClientResponse extends IncomingMessage { }
 
-	export interface AgentOptions {
+    export interface AgentOptions {
         /**
          * Keep sockets around in a pool to be used by other requests in the future. Default = false
          */
-		keepAlive?: boolean;
+        keepAlive?: boolean;
         /**
          * When using HTTP KeepAlive, how often to send TCP KeepAlive packets over sockets being kept alive. Default = 1000.
          * Only relevant if keepAlive is set to true.
          */
-		keepAliveMsecs?: number;
+        keepAliveMsecs?: number;
         /**
          * Maximum number of sockets to allow per host. Default for Node 0.10 is 5, default for Node 0.12 is Infinity
          */
-		maxSockets?: number;
+        maxSockets?: number;
         /**
          * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256.
          */
-		maxFreeSockets?: number;
-	}
+        maxFreeSockets?: number;
+    }
 
-	export class Agent {
-		maxSockets: number;
-		sockets: any;
-		requests: any;
+    export class Agent {
+        maxSockets: number;
+        sockets: any;
+        requests: any;
 
-		constructor(opts?: AgentOptions);
+        constructor(opts?: AgentOptions);
 
         /**
          * Destroy any sockets that are currently in use by the agent.
@@ -807,62 +1145,61 @@ declare module "http" {
          * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
          * sockets may hang open for quite a long time before the server terminates them.
          */
-		destroy(): void;
-	}
+        destroy(): void;
+    }
 
-	export var METHODS: string[];
+    export var METHODS: string[];
 
-	export var STATUS_CODES: {
-		[errorCode: number]: string;
-		[errorCode: string]: string;
-	};
-	export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
-	export function createClient(port?: number, host?: string): any;
-	export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
-	export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
-	export var globalAgent: Agent;
+    export var STATUS_CODES: {
+        [errorCode: number]: string | undefined;
+        [errorCode: string]: string | undefined;
+    };
+
+    export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
+    export function createClient(port?: number, host?: string): any;
+
+    // although RequestOptions are passed as ClientRequestArgs to ClientRequest directly,
+    // create interface RequestOptions would make the naming more clear to developers
+    export interface RequestOptions extends ClientRequestArgs { }
+    export function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export var globalAgent: Agent;
 }
 
 declare module "cluster" {
-	import * as child from "child_process";
-	import * as events from "events";
-	import * as net from "net";
+    import * as child from "child_process";
+    import * as events from "events";
+    import * as net from "net";
 
-	// interfaces
-	export interface ClusterSettings {
-		execArgv?: string[]; // default: process.execArgv
-		exec?: string;
-		args?: string[];
-		silent?: boolean;
-		stdio?: any[];
-		uid?: number;
-		gid?: number;
-	}
+    // interfaces
+    export interface ClusterSettings {
+        execArgv?: string[]; // default: process.execArgv
+        exec?: string;
+        args?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+        inspectPort?: number | (() => number);
+    }
 
-	export interface ClusterSetupMasterSettings {
-		exec?: string;  // default: process.argv[1]
-		args?: string[];  // default: process.argv.slice(2)
-		silent?: boolean;  // default: false
-		stdio?: any[];
-	}
+    export interface Address {
+        address: string;
+        port: number;
+        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
+    }
 
-	export interface Address {
-		address: string;
-		port: number;
-		addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
-	}
-
-	export class Worker extends events.EventEmitter {
-		id: string;
-		process: child.ChildProcess;
-		suicide: boolean;
-		send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
-		kill(signal?: string): void;
-		destroy(signal?: string): void;
-		disconnect(): void;
-		isConnected(): boolean;
-		isDead(): boolean;
-		exitedAfterDisconnect: boolean;
+    export class Worker extends events.EventEmitter {
+        id: number;
+        process: child.ChildProcess;
+        suicide: boolean;
+        send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
+        kill(signal?: string): void;
+        destroy(signal?: string): void;
+        disconnect(): void;
+        isConnected(): boolean;
+        isDead(): boolean;
+        exitedAfterDisconnect: boolean;
 
         /**
          * events.EventEmitter
@@ -873,68 +1210,68 @@ declare module "cluster" {
          *   5. message
          *   6. online
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "disconnect", listener: () => void): this;
-		addListener(event: "error", listener: (error: Error) => void): this;
-		addListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		addListener(event: "listening", listener: (address: Address) => void): this;
-		addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		addListener(event: "online", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "listening", listener: (address: Address) => void): this;
+        addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "disconnect", listener: () => void): boolean
-		emit(event: "error", listener: (error: Error) => void): boolean
-		emit(event: "exit", listener: (code: number, signal: string) => void): boolean
-		emit(event: "listening", listener: (address: Address) => void): boolean
-		emit(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): boolean
-		emit(event: "online", listener: () => void): boolean
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "listening", address: Address): boolean;
+        emit(event: "message", message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "disconnect", listener: () => void): this;
-		on(event: "error", listener: (error: Error) => void): this;
-		on(event: "exit", listener: (code: number, signal: string) => void): this;
-		on(event: "listening", listener: (address: Address) => void): this;
-		on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		on(event: "online", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "listening", listener: (address: Address) => void): this;
+        on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "disconnect", listener: () => void): this;
-		once(event: "error", listener: (error: Error) => void): this;
-		once(event: "exit", listener: (code: number, signal: string) => void): this;
-		once(event: "listening", listener: (address: Address) => void): this;
-		once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		once(event: "online", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "listening", listener: (address: Address) => void): this;
+        once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "disconnect", listener: () => void): this;
-		prependListener(event: "error", listener: (error: Error) => void): this;
-		prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependListener(event: "listening", listener: (address: Address) => void): this;
-		prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependListener(event: "online", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "listening", listener: (address: Address) => void): this;
+        prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "disconnect", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (error: Error) => void): this;
-		prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependOnceListener(event: "listening", listener: (address: Address) => void): this;
-		prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependOnceListener(event: "online", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: () => void): this;
+    }
 
-	export interface Cluster extends events.EventEmitter {
-		Worker: Worker;
-		disconnect(callback?: Function): void;
-		fork(env?: any): Worker;
-		isMaster: boolean;
-		isWorker: boolean;
-		// TODO: cluster.schedulingPolicy
-		settings: ClusterSettings;
-		setupMaster(settings?: ClusterSetupMasterSettings): void;
-		worker: Worker;
-		workers: {
-			[index: string]: Worker
-		};
+    export interface Cluster extends events.EventEmitter {
+        Worker: Worker;
+        disconnect(callback?: Function): void;
+        fork(env?: any): Worker;
+        isMaster: boolean;
+        isWorker: boolean;
+        // TODO: cluster.schedulingPolicy
+        settings: ClusterSettings;
+        setupMaster(settings?: ClusterSettings): void;
+        worker?: Worker;
+        workers?: {
+            [index: string]: Worker | undefined
+        };
 
         /**
          * events.EventEmitter
@@ -946,73 +1283,72 @@ declare module "cluster" {
          *   6. online
          *   7. setup
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "disconnect", listener: (worker: Worker) => void): this;
-		addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		addListener(event: "fork", listener: (worker: Worker) => void): this;
-		addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		addListener(event: "online", listener: (worker: Worker) => void): this;
-		addListener(event: "setup", listener: (settings: any) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        addListener(event: "fork", listener: (worker: Worker) => void): this;
+        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: (worker: Worker) => void): this;
+        addListener(event: "setup", listener: (settings: any) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
-		emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
-		emit(event: "fork", listener: (worker: Worker) => void): boolean;
-		emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
-		emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
-		emit(event: "online", listener: (worker: Worker) => void): boolean;
-		emit(event: "setup", listener: (settings: any) => void): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect", worker: Worker): boolean;
+        emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+        emit(event: "fork", worker: Worker): boolean;
+        emit(event: "listening", worker: Worker, address: Address): boolean;
+        emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online", worker: Worker): boolean;
+        emit(event: "setup", settings: any): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "disconnect", listener: (worker: Worker) => void): this;
-		on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		on(event: "fork", listener: (worker: Worker) => void): this;
-		on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		on(event: "online", listener: (worker: Worker) => void): this;
-		on(event: "setup", listener: (settings: any) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: (worker: Worker) => void): this;
+        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        on(event: "fork", listener: (worker: Worker) => void): this;
+        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: (worker: Worker) => void): this;
+        on(event: "setup", listener: (settings: any) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "disconnect", listener: (worker: Worker) => void): this;
-		once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		once(event: "fork", listener: (worker: Worker) => void): this;
-		once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		once(event: "online", listener: (worker: Worker) => void): this;
-		once(event: "setup", listener: (settings: any) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: (worker: Worker) => void): this;
+        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        once(event: "fork", listener: (worker: Worker) => void): this;
+        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: (worker: Worker) => void): this;
+        once(event: "setup", listener: (settings: any) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
-		prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		prependListener(event: "fork", listener: (worker: Worker) => void): this;
-		prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependListener(event: "online", listener: (worker: Worker) => void): this;
-		prependListener(event: "setup", listener: (settings: any) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: (worker: Worker) => void): this;
+        prependListener(event: "setup", listener: (settings: any) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
-		prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
-		prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
-		prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+    }
 
-	}
-
-	export function disconnect(callback?: Function): void;
-	export function fork(env?: any): Worker;
-	export var isMaster: boolean;
-	export var isWorker: boolean;
-	// TODO: cluster.schedulingPolicy
-	export var settings: ClusterSettings;
-	export function setupMaster(settings?: ClusterSetupMasterSettings): void;
-	export var worker: Worker;
-	export var workers: {
-		[index: string]: Worker
-	};
+    export function disconnect(callback?: Function): void;
+    export function fork(env?: any): Worker;
+    export var isMaster: boolean;
+    export var isWorker: boolean;
+    // TODO: cluster.schedulingPolicy
+    export var settings: ClusterSettings;
+    export function setupMaster(settings?: ClusterSettings): void;
+    export var worker: Worker;
+    export var workers: {
+        [index: string]: Worker | undefined
+    };
 
     /**
      * events.EventEmitter
@@ -1024,499 +1360,520 @@ declare module "cluster" {
      *   6. online
      *   7. setup
      */
-	export function addListener(event: string, listener: Function): Cluster;
-	export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+    export function addListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function emit(event: string | symbol, ...args: any[]): boolean;
-	export function emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
-	export function emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
-	export function emit(event: "fork", listener: (worker: Worker) => void): boolean;
-	export function emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
-	export function emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
-	export function emit(event: "online", listener: (worker: Worker) => void): boolean;
-	export function emit(event: "setup", listener: (settings: any) => void): boolean;
+    export function emit(event: string | symbol, ...args: any[]): boolean;
+    export function emit(event: "disconnect", worker: Worker): boolean;
+    export function emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+    export function emit(event: "fork", worker: Worker): boolean;
+    export function emit(event: "listening", worker: Worker, address: Address): boolean;
+    export function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+    export function emit(event: "online", worker: Worker): boolean;
+    export function emit(event: "setup", settings: any): boolean;
 
-	export function on(event: string, listener: Function): Cluster;
-	export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function on(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function on(event: "setup", listener: (settings: any) => void): Cluster;
+    export function on(event: string, listener: (...args: any[]) => void): Cluster;
+    export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function on(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function once(event: string, listener: Function): Cluster;
-	export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function once(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function once(event: "setup", listener: (settings: any) => void): Cluster;
+    export function once(event: string, listener: (...args: any[]) => void): Cluster;
+    export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function once(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function removeListener(event: string, listener: Function): Cluster;
-	export function removeAllListeners(event?: string): Cluster;
-	export function setMaxListeners(n: number): Cluster;
-	export function getMaxListeners(): number;
-	export function listeners(event: string): Function[];
-	export function listenerCount(type: string): number;
+    export function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function removeAllListeners(event?: string): Cluster;
+    export function setMaxListeners(n: number): Cluster;
+    export function getMaxListeners(): number;
+    export function listeners(event: string): Function[];
+    export function listenerCount(type: string): number;
 
-	export function prependListener(event: string, listener: Function): Cluster;
-	export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+    export function prependListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function prependOnceListener(event: string, listener: Function): Cluster;
-	export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+    export function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function eventNames(): string[];
+    export function eventNames(): string[];
 }
 
 declare module "zlib" {
-	import * as stream from "stream";
+    import * as stream from "stream";
 
-	export interface ZlibOptions {
-		flush?: number; // default: zlib.constants.Z_NO_FLUSH
-		finishFlush?: number; // default: zlib.constants.Z_FINISH
-		chunkSize?: number; // default: 16*1024
-		windowBits?: number;
-		level?: number; // compression only
-		memLevel?: number; // compression only
-		strategy?: number; // compression only
-		dictionary?: any; // deflate/inflate only, empty dictionary by default
-	}
+    export interface ZlibOptions {
+        flush?: number; // default: zlib.constants.Z_NO_FLUSH
+        finishFlush?: number; // default: zlib.constants.Z_FINISH
+        chunkSize?: number; // default: 16*1024
+        windowBits?: number;
+        level?: number; // compression only
+        memLevel?: number; // compression only
+        strategy?: number; // compression only
+        dictionary?: any; // deflate/inflate only, empty dictionary by default
+    }
 
-	export interface Gzip extends stream.Transform { }
-	export interface Gunzip extends stream.Transform { }
-	export interface Deflate extends stream.Transform { }
-	export interface Inflate extends stream.Transform { }
-	export interface DeflateRaw extends stream.Transform { }
-	export interface InflateRaw extends stream.Transform { }
-	export interface Unzip extends stream.Transform { }
+    export interface Zlib {
+        readonly bytesRead: number;
+        close(callback?: () => void): void;
+        flush(kind?: number | (() => void), callback?: () => void): void;
+    }
 
-	export function createGzip(options?: ZlibOptions): Gzip;
-	export function createGunzip(options?: ZlibOptions): Gunzip;
-	export function createDeflate(options?: ZlibOptions): Deflate;
-	export function createInflate(options?: ZlibOptions): Inflate;
-	export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
-	export function createInflateRaw(options?: ZlibOptions): InflateRaw;
-	export function createUnzip(options?: ZlibOptions): Unzip;
+    export interface ZlibParams {
+        params(level: number, strategy: number, callback: () => void): void;
+    }
 
-	export function deflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function deflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function gzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function gzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function gunzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function gunzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function inflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function inflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function inflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function unzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function unzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export interface ZlibReset {
+        reset(): void;
+    }
 
-	export namespace constants {
-		// Allowed flush values.
+    export interface Gzip extends stream.Transform, Zlib { }
+    export interface Gunzip extends stream.Transform, Zlib { }
+    export interface Deflate extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface Inflate extends stream.Transform, Zlib, ZlibReset { }
+    export interface DeflateRaw extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface InflateRaw extends stream.Transform, Zlib, ZlibReset { }
+    export interface Unzip extends stream.Transform, Zlib { }
 
-		export const Z_NO_FLUSH: number;
-		export const Z_PARTIAL_FLUSH: number;
-		export const Z_SYNC_FLUSH: number;
-		export const Z_FULL_FLUSH: number;
-		export const Z_FINISH: number;
-		export const Z_BLOCK: number;
-		export const Z_TREES: number;
+    export function createGzip(options?: ZlibOptions): Gzip;
+    export function createGunzip(options?: ZlibOptions): Gunzip;
+    export function createDeflate(options?: ZlibOptions): Deflate;
+    export function createInflate(options?: ZlibOptions): Inflate;
+    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    export function createUnzip(options?: ZlibOptions): Unzip;
 
-		// Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
+    export function deflate(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function deflateRaw(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function gzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function gunzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function inflate(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function inflateRaw(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function unzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
 
-		export const Z_OK: number;
-		export const Z_STREAM_END: number;
-		export const Z_NEED_DICT: number;
-		export const Z_ERRNO: number;
-		export const Z_STREAM_ERROR: number;
-		export const Z_DATA_ERROR: number;
-		export const Z_MEM_ERROR: number;
-		export const Z_BUF_ERROR: number;
-		export const Z_VERSION_ERROR: number;
+    export namespace constants {
+        // Allowed flush values.
 
-		// Compression levels.
+        export const Z_NO_FLUSH: number;
+        export const Z_PARTIAL_FLUSH: number;
+        export const Z_SYNC_FLUSH: number;
+        export const Z_FULL_FLUSH: number;
+        export const Z_FINISH: number;
+        export const Z_BLOCK: number;
+        export const Z_TREES: number;
 
-		export const Z_NO_COMPRESSION: number;
-		export const Z_BEST_SPEED: number;
-		export const Z_BEST_COMPRESSION: number;
-		export const Z_DEFAULT_COMPRESSION: number;
+        // Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
 
-		// Compression strategy.
+        export const Z_OK: number;
+        export const Z_STREAM_END: number;
+        export const Z_NEED_DICT: number;
+        export const Z_ERRNO: number;
+        export const Z_STREAM_ERROR: number;
+        export const Z_DATA_ERROR: number;
+        export const Z_MEM_ERROR: number;
+        export const Z_BUF_ERROR: number;
+        export const Z_VERSION_ERROR: number;
 
-		export const Z_FILTERED: number;
-		export const Z_HUFFMAN_ONLY: number;
-		export const Z_RLE: number;
-		export const Z_FIXED: number;
-		export const Z_DEFAULT_STRATEGY: number;
-	}
+        // Compression levels.
 
-	// Constants
-	export var Z_NO_FLUSH: number;
-	export var Z_PARTIAL_FLUSH: number;
-	export var Z_SYNC_FLUSH: number;
-	export var Z_FULL_FLUSH: number;
-	export var Z_FINISH: number;
-	export var Z_BLOCK: number;
-	export var Z_TREES: number;
-	export var Z_OK: number;
-	export var Z_STREAM_END: number;
-	export var Z_NEED_DICT: number;
-	export var Z_ERRNO: number;
-	export var Z_STREAM_ERROR: number;
-	export var Z_DATA_ERROR: number;
-	export var Z_MEM_ERROR: number;
-	export var Z_BUF_ERROR: number;
-	export var Z_VERSION_ERROR: number;
-	export var Z_NO_COMPRESSION: number;
-	export var Z_BEST_SPEED: number;
-	export var Z_BEST_COMPRESSION: number;
-	export var Z_DEFAULT_COMPRESSION: number;
-	export var Z_FILTERED: number;
-	export var Z_HUFFMAN_ONLY: number;
-	export var Z_RLE: number;
-	export var Z_FIXED: number;
-	export var Z_DEFAULT_STRATEGY: number;
-	export var Z_BINARY: number;
-	export var Z_TEXT: number;
-	export var Z_ASCII: number;
-	export var Z_UNKNOWN: number;
-	export var Z_DEFLATED: number;
+        export const Z_NO_COMPRESSION: number;
+        export const Z_BEST_SPEED: number;
+        export const Z_BEST_COMPRESSION: number;
+        export const Z_DEFAULT_COMPRESSION: number;
+
+        // Compression strategy.
+
+        export const Z_FILTERED: number;
+        export const Z_HUFFMAN_ONLY: number;
+        export const Z_RLE: number;
+        export const Z_FIXED: number;
+        export const Z_DEFAULT_STRATEGY: number;
+    }
+
+    // Constants
+    export var Z_NO_FLUSH: number;
+    export var Z_PARTIAL_FLUSH: number;
+    export var Z_SYNC_FLUSH: number;
+    export var Z_FULL_FLUSH: number;
+    export var Z_FINISH: number;
+    export var Z_BLOCK: number;
+    export var Z_TREES: number;
+    export var Z_OK: number;
+    export var Z_STREAM_END: number;
+    export var Z_NEED_DICT: number;
+    export var Z_ERRNO: number;
+    export var Z_STREAM_ERROR: number;
+    export var Z_DATA_ERROR: number;
+    export var Z_MEM_ERROR: number;
+    export var Z_BUF_ERROR: number;
+    export var Z_VERSION_ERROR: number;
+    export var Z_NO_COMPRESSION: number;
+    export var Z_BEST_SPEED: number;
+    export var Z_BEST_COMPRESSION: number;
+    export var Z_DEFAULT_COMPRESSION: number;
+    export var Z_FILTERED: number;
+    export var Z_HUFFMAN_ONLY: number;
+    export var Z_RLE: number;
+    export var Z_FIXED: number;
+    export var Z_DEFAULT_STRATEGY: number;
+    export var Z_BINARY: number;
+    export var Z_TEXT: number;
+    export var Z_ASCII: number;
+    export var Z_UNKNOWN: number;
+    export var Z_DEFLATED: number;
 }
 
 declare module "os" {
-	export interface CpuInfo {
-		model: string;
-		speed: number;
-		times: {
-			user: number;
-			nice: number;
-			sys: number;
-			idle: number;
-			irq: number;
-		};
-	}
+    export interface CpuInfo {
+        model: string;
+        speed: number;
+        times: {
+            user: number;
+            nice: number;
+            sys: number;
+            idle: number;
+            irq: number;
+        };
+    }
 
-	export interface NetworkInterfaceInfo {
-		address: string;
-		netmask: string;
-		family: string;
-		mac: string;
-		internal: boolean;
-	}
+    export interface NetworkInterfaceBase {
+        address: string;
+        netmask: string;
+        mac: string;
+        internal: boolean;
+    }
 
-	export function hostname(): string;
-	export function loadavg(): number[];
-	export function uptime(): number;
-	export function freemem(): number;
-	export function totalmem(): number;
-	export function cpus(): CpuInfo[];
-	export function type(): string;
-	export function release(): string;
-	export function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
-	export function homedir(): string;
-	export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string }
-	export var constants: {
-		UV_UDP_REUSEADDR: number,
-		signals: {
-			SIGHUP: number;
-			SIGINT: number;
-			SIGQUIT: number;
-			SIGILL: number;
-			SIGTRAP: number;
-			SIGABRT: number;
-			SIGIOT: number;
-			SIGBUS: number;
-			SIGFPE: number;
-			SIGKILL: number;
-			SIGUSR1: number;
-			SIGSEGV: number;
-			SIGUSR2: number;
-			SIGPIPE: number;
-			SIGALRM: number;
-			SIGTERM: number;
-			SIGCHLD: number;
-			SIGSTKFLT: number;
-			SIGCONT: number;
-			SIGSTOP: number;
-			SIGTSTP: number;
-			SIGTTIN: number;
-			SIGTTOU: number;
-			SIGURG: number;
-			SIGXCPU: number;
-			SIGXFSZ: number;
-			SIGVTALRM: number;
-			SIGPROF: number;
-			SIGWINCH: number;
-			SIGIO: number;
-			SIGPOLL: number;
-			SIGPWR: number;
-			SIGSYS: number;
-			SIGUNUSED: number;
-		},
-		errno: {
-			E2BIG: number;
-			EACCES: number;
-			EADDRINUSE: number;
-			EADDRNOTAVAIL: number;
-			EAFNOSUPPORT: number;
-			EAGAIN: number;
-			EALREADY: number;
-			EBADF: number;
-			EBADMSG: number;
-			EBUSY: number;
-			ECANCELED: number;
-			ECHILD: number;
-			ECONNABORTED: number;
-			ECONNREFUSED: number;
-			ECONNRESET: number;
-			EDEADLK: number;
-			EDESTADDRREQ: number;
-			EDOM: number;
-			EDQUOT: number;
-			EEXIST: number;
-			EFAULT: number;
-			EFBIG: number;
-			EHOSTUNREACH: number;
-			EIDRM: number;
-			EILSEQ: number;
-			EINPROGRESS: number;
-			EINTR: number;
-			EINVAL: number;
-			EIO: number;
-			EISCONN: number;
-			EISDIR: number;
-			ELOOP: number;
-			EMFILE: number;
-			EMLINK: number;
-			EMSGSIZE: number;
-			EMULTIHOP: number;
-			ENAMETOOLONG: number;
-			ENETDOWN: number;
-			ENETRESET: number;
-			ENETUNREACH: number;
-			ENFILE: number;
-			ENOBUFS: number;
-			ENODATA: number;
-			ENODEV: number;
-			ENOENT: number;
-			ENOEXEC: number;
-			ENOLCK: number;
-			ENOLINK: number;
-			ENOMEM: number;
-			ENOMSG: number;
-			ENOPROTOOPT: number;
-			ENOSPC: number;
-			ENOSR: number;
-			ENOSTR: number;
-			ENOSYS: number;
-			ENOTCONN: number;
-			ENOTDIR: number;
-			ENOTEMPTY: number;
-			ENOTSOCK: number;
-			ENOTSUP: number;
-			ENOTTY: number;
-			ENXIO: number;
-			EOPNOTSUPP: number;
-			EOVERFLOW: number;
-			EPERM: number;
-			EPIPE: number;
-			EPROTO: number;
-			EPROTONOSUPPORT: number;
-			EPROTOTYPE: number;
-			ERANGE: number;
-			EROFS: number;
-			ESPIPE: number;
-			ESRCH: number;
-			ESTALE: number;
-			ETIME: number;
-			ETIMEDOUT: number;
-			ETXTBSY: number;
-			EWOULDBLOCK: number;
-			EXDEV: number;
-		},
-	};
-	export function arch(): string;
-	export function platform(): NodeJS.Platform;
-	export function tmpdir(): string;
-	export var EOL: string;
-	export function endianness(): "BE" | "LE";
+    export interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
+        family: "IPv4";
+    }
+
+    export interface NetworkInterfaceInfoIPv6 extends NetworkInterfaceBase {
+        family: "IPv6";
+        scopeid: number;
+    }
+
+    export type NetworkInterfaceInfo = NetworkInterfaceInfoIPv4 | NetworkInterfaceInfoIPv6;
+
+    export function hostname(): string;
+    export function loadavg(): number[];
+    export function uptime(): number;
+    export function freemem(): number;
+    export function totalmem(): number;
+    export function cpus(): CpuInfo[];
+    export function type(): string;
+    export function release(): string;
+    export function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
+    export function homedir(): string;
+    export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string };
+    export var constants: {
+        UV_UDP_REUSEADDR: number,
+        signals: {
+            SIGHUP: number;
+            SIGINT: number;
+            SIGQUIT: number;
+            SIGILL: number;
+            SIGTRAP: number;
+            SIGABRT: number;
+            SIGIOT: number;
+            SIGBUS: number;
+            SIGFPE: number;
+            SIGKILL: number;
+            SIGUSR1: number;
+            SIGSEGV: number;
+            SIGUSR2: number;
+            SIGPIPE: number;
+            SIGALRM: number;
+            SIGTERM: number;
+            SIGCHLD: number;
+            SIGSTKFLT: number;
+            SIGCONT: number;
+            SIGSTOP: number;
+            SIGTSTP: number;
+            SIGTTIN: number;
+            SIGTTOU: number;
+            SIGURG: number;
+            SIGXCPU: number;
+            SIGXFSZ: number;
+            SIGVTALRM: number;
+            SIGPROF: number;
+            SIGWINCH: number;
+            SIGIO: number;
+            SIGPOLL: number;
+            SIGPWR: number;
+            SIGSYS: number;
+            SIGUNUSED: number;
+        },
+        errno: {
+            E2BIG: number;
+            EACCES: number;
+            EADDRINUSE: number;
+            EADDRNOTAVAIL: number;
+            EAFNOSUPPORT: number;
+            EAGAIN: number;
+            EALREADY: number;
+            EBADF: number;
+            EBADMSG: number;
+            EBUSY: number;
+            ECANCELED: number;
+            ECHILD: number;
+            ECONNABORTED: number;
+            ECONNREFUSED: number;
+            ECONNRESET: number;
+            EDEADLK: number;
+            EDESTADDRREQ: number;
+            EDOM: number;
+            EDQUOT: number;
+            EEXIST: number;
+            EFAULT: number;
+            EFBIG: number;
+            EHOSTUNREACH: number;
+            EIDRM: number;
+            EILSEQ: number;
+            EINPROGRESS: number;
+            EINTR: number;
+            EINVAL: number;
+            EIO: number;
+            EISCONN: number;
+            EISDIR: number;
+            ELOOP: number;
+            EMFILE: number;
+            EMLINK: number;
+            EMSGSIZE: number;
+            EMULTIHOP: number;
+            ENAMETOOLONG: number;
+            ENETDOWN: number;
+            ENETRESET: number;
+            ENETUNREACH: number;
+            ENFILE: number;
+            ENOBUFS: number;
+            ENODATA: number;
+            ENODEV: number;
+            ENOENT: number;
+            ENOEXEC: number;
+            ENOLCK: number;
+            ENOLINK: number;
+            ENOMEM: number;
+            ENOMSG: number;
+            ENOPROTOOPT: number;
+            ENOSPC: number;
+            ENOSR: number;
+            ENOSTR: number;
+            ENOSYS: number;
+            ENOTCONN: number;
+            ENOTDIR: number;
+            ENOTEMPTY: number;
+            ENOTSOCK: number;
+            ENOTSUP: number;
+            ENOTTY: number;
+            ENXIO: number;
+            EOPNOTSUPP: number;
+            EOVERFLOW: number;
+            EPERM: number;
+            EPIPE: number;
+            EPROTO: number;
+            EPROTONOSUPPORT: number;
+            EPROTOTYPE: number;
+            ERANGE: number;
+            EROFS: number;
+            ESPIPE: number;
+            ESRCH: number;
+            ESTALE: number;
+            ETIME: number;
+            ETIMEDOUT: number;
+            ETXTBSY: number;
+            EWOULDBLOCK: number;
+            EXDEV: number;
+        },
+    };
+    export function arch(): string;
+    export function platform(): NodeJS.Platform;
+    export function tmpdir(): string;
+    export const EOL: string;
+    export function endianness(): "BE" | "LE";
 }
 
 declare module "https" {
-	import * as tls from "tls";
-	import * as events from "events";
-	import * as http from "http";
+    import * as tls from "tls";
+    import * as events from "events";
+    import * as http from "http";
+    import { URL } from "url";
 
-	export interface ServerOptions {
-		pfx?: any;
-		key?: any;
-		passphrase?: string;
-		cert?: any;
-		ca?: any;
-		crl?: any;
-		ciphers?: string;
-		honorCipherOrder?: boolean;
-		requestCert?: boolean;
-		rejectUnauthorized?: boolean;
-		NPNProtocols?: any;
-		SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
-	}
+    export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
 
-	export interface RequestOptions extends http.RequestOptions {
-		pfx?: any;
-		key?: any;
-		passphrase?: string;
-		cert?: any;
-		ca?: any;
-		ciphers?: string;
-		rejectUnauthorized?: boolean;
-		secureProtocol?: string;
-	}
+    // see https://nodejs.org/docs/latest-v8.x/api/https.html#https_https_request_options_callback
+    type extendedRequestKeys = "pfx" |
+        "key" |
+        "passphrase" |
+        "cert" |
+        "ca" |
+        "ciphers" |
+        "rejectUnauthorized" |
+        "secureProtocol" |
+        "servername";
 
-	export interface Agent extends http.Agent { }
+    export type RequestOptions = http.RequestOptions & Pick<tls.ConnectionOptions, extendedRequestKeys>;
 
-	export interface AgentOptions extends http.AgentOptions {
-		pfx?: any;
-		key?: any;
-		passphrase?: string;
-		cert?: any;
-		ca?: any;
-		ciphers?: string;
-		rejectUnauthorized?: boolean;
-		secureProtocol?: string;
-		maxCachedSessions?: number;
-	}
+    export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
+        rejectUnauthorized?: boolean;
+        maxCachedSessions?: number;
+    }
 
-	export var Agent: {
-		new(options?: AgentOptions): Agent;
-	};
-	export interface Server extends tls.Server { }
-	export function createServer(options: ServerOptions, requestListener?: Function): Server;
-	export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-	export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-	export var globalAgent: Agent;
+    export class Agent extends http.Agent {
+        constructor(options?: AgentOptions);
+    }
+
+    export class Server extends tls.Server {
+        setTimeout(callback: () => void): this;
+        setTimeout(msecs?: number, callback?: () => void): this;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+
+    export function createServer(options: ServerOptions, requestListener?: (req: http.IncomingMessage, res: http.ServerResponse) => void): Server;
+    export function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export var globalAgent: Agent;
 }
 
 declare module "punycode" {
-	export function decode(string: string): string;
-	export function encode(string: string): string;
-	export function toUnicode(domain: string): string;
-	export function toASCII(domain: string): string;
-	export var ucs2: ucs2;
-	interface ucs2 {
-		decode(string: string): number[];
-		encode(codePoints: number[]): string;
-	}
-	export var version: any;
+    export function decode(string: string): string;
+    export function encode(string: string): string;
+    export function toUnicode(domain: string): string;
+    export function toASCII(domain: string): string;
+    export var ucs2: ucs2;
+    interface ucs2 {
+        decode(string: string): number[];
+        encode(codePoints: number[]): string;
+    }
+    export var version: any;
 }
 
 declare module "repl" {
-	import * as stream from "stream";
-	import * as readline from "readline";
+    import * as stream from "stream";
+    import * as readline from "readline";
 
-	export interface ReplOptions {
-		prompt?: string;
-		input?: NodeJS.ReadableStream;
-		output?: NodeJS.WritableStream;
-		terminal?: boolean;
-		eval?: Function;
-		useColors?: boolean;
-		useGlobal?: boolean;
-		ignoreUndefined?: boolean;
-		writer?: Function;
-		completer?: Function;
-		replMode?: any;
-		breakEvalOnSigint?: any;
-	}
+    export interface ReplOptions {
+        prompt?: string;
+        input?: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        terminal?: boolean;
+        eval?: Function;
+        useColors?: boolean;
+        useGlobal?: boolean;
+        ignoreUndefined?: boolean;
+        writer?: Function;
+        completer?: Function;
+        replMode?: any;
+        breakEvalOnSigint?: any;
+    }
 
-	export interface REPLServer extends readline.ReadLine {
-		context: any;
-		defineCommand(keyword: string, cmd: Function | { help: string, action: Function }): void;
-		displayPrompt(preserveCursor?: boolean): void;
+    export interface REPLServer extends readline.ReadLine {
+        context: any;
+        inputStream: NodeJS.ReadableStream;
+        outputStream: NodeJS.WritableStream;
+
+        defineCommand(keyword: string, cmd: Function | { help: string, action: Function }): void;
+        displayPrompt(preserveCursor?: boolean): void;
 
         /**
          * events.EventEmitter
          * 1. exit
          * 2. reset
-         **/
+         */
 
-		addListener(event: string, listener: Function): this;
-		addListener(event: "exit", listener: () => void): this;
-		addListener(event: "reset", listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "exit", listener: () => void): this;
+        addListener(event: "reset", listener: (...args: any[]) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "exit"): boolean;
-		emit(event: "reset", context: any): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "exit"): boolean;
+        emit(event: "reset", context: any): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "exit", listener: () => void): this;
-		on(event: "reset", listener: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "exit", listener: () => void): this;
+        on(event: "reset", listener: (...args: any[]) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "exit", listener: () => void): this;
-		once(event: "reset", listener: Function): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "exit", listener: () => void): this;
+        once(event: "reset", listener: (...args: any[]) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "exit", listener: () => void): this;
-		prependListener(event: "reset", listener: Function): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "exit", listener: () => void): this;
+        prependListener(event: "reset", listener: (...args: any[]) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "exit", listener: () => void): this;
-		prependOnceListener(event: "reset", listener: Function): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "exit", listener: () => void): this;
+        prependOnceListener(event: "reset", listener: (...args: any[]) => void): this;
+    }
 
-	export function start(options?: string | ReplOptions): REPLServer;
+    export function start(options?: string | ReplOptions): REPLServer;
+
+    export class Recoverable extends SyntaxError {
+        err: Error;
+
+        constructor(err: Error);
+    }
 }
 
 declare module "readline" {
-	import * as events from "events";
-	import * as stream from "stream";
+    import * as events from "events";
+    import * as stream from "stream";
 
-	export interface Key {
-		sequence?: string;
-		name?: string;
-		ctrl?: boolean;
-		meta?: boolean;
-		shift?: boolean;
-	}
+    export interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
 
-	export interface ReadLine extends events.EventEmitter {
-		setPrompt(prompt: string): void;
-		prompt(preserveCursor?: boolean): void;
-		question(query: string, callback: (answer: string) => void): void;
-		pause(): ReadLine;
-		resume(): ReadLine;
-		close(): void;
-		write(data: string | Buffer, key?: Key): void;
+    export interface ReadLine extends events.EventEmitter {
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        pause(): ReadLine;
+        resume(): ReadLine;
+        close(): void;
+        write(data: string | Buffer, key?: Key): void;
 
         /**
          * events.EventEmitter
@@ -1527,138 +1884,138 @@ declare module "readline" {
          * 5. SIGCONT
          * 6. SIGINT
          * 7. SIGTSTP
-         **/
+         */
 
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: () => void): this;
-		addListener(event: "line", listener: (input: any) => void): this;
-		addListener(event: "pause", listener: () => void): this;
-		addListener(event: "resume", listener: () => void): this;
-		addListener(event: "SIGCONT", listener: () => void): this;
-		addListener(event: "SIGINT", listener: () => void): this;
-		addListener(event: "SIGTSTP", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: any) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close"): boolean;
-		emit(event: "line", input: any): boolean;
-		emit(event: "pause"): boolean;
-		emit(event: "resume"): boolean;
-		emit(event: "SIGCONT"): boolean;
-		emit(event: "SIGINT"): boolean;
-		emit(event: "SIGTSTP"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: any): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: () => void): this;
-		on(event: "line", listener: (input: any) => void): this;
-		on(event: "pause", listener: () => void): this;
-		on(event: "resume", listener: () => void): this;
-		on(event: "SIGCONT", listener: () => void): this;
-		on(event: "SIGINT", listener: () => void): this;
-		on(event: "SIGTSTP", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: any) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: () => void): this;
-		once(event: "line", listener: (input: any) => void): this;
-		once(event: "pause", listener: () => void): this;
-		once(event: "resume", listener: () => void): this;
-		once(event: "SIGCONT", listener: () => void): this;
-		once(event: "SIGINT", listener: () => void): this;
-		once(event: "SIGTSTP", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: any) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: () => void): this;
-		prependListener(event: "line", listener: (input: any) => void): this;
-		prependListener(event: "pause", listener: () => void): this;
-		prependListener(event: "resume", listener: () => void): this;
-		prependListener(event: "SIGCONT", listener: () => void): this;
-		prependListener(event: "SIGINT", listener: () => void): this;
-		prependListener(event: "SIGTSTP", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: any) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-		prependOnceListener(event: "line", listener: (input: any) => void): this;
-		prependOnceListener(event: "pause", listener: () => void): this;
-		prependOnceListener(event: "resume", listener: () => void): this;
-		prependOnceListener(event: "SIGCONT", listener: () => void): this;
-		prependOnceListener(event: "SIGINT", listener: () => void): this;
-		prependOnceListener(event: "SIGTSTP", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: any) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+    }
 
-	type Completer = (line: string) => CompleterResult;
-	type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
+    type Completer = (line: string) => CompleterResult;
+    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
 
-	export type CompleterResult = [string[], string];
+    export type CompleterResult = [string[], string];
 
-	export interface ReadLineOptions {
-		input: NodeJS.ReadableStream;
-		output?: NodeJS.WritableStream;
-		completer?: Completer | AsyncCompleter;
-		terminal?: boolean;
-		historySize?: number;
-		prompt?: string;
-		crlfDelay?: number;
-		removeHistoryDuplicates?: boolean;
-	}
+    export interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer | AsyncCompleter;
+        terminal?: boolean;
+        historySize?: number;
+    }
 
-	export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
-	export function createInterface(options: ReadLineOptions): ReadLine;
+    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
+    export function createInterface(options: ReadLineOptions): ReadLine;
 
-	export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
-	export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
-	export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
-	export function clearScreenDown(stream: NodeJS.WritableStream): void;
+    export function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
+    export function emitKeypressEvents(stream: NodeJS.ReadableStream, interface?: ReadLine): void;
+    export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
+    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    export function clearScreenDown(stream: NodeJS.WritableStream): void;
 }
 
 declare module "vm" {
-	export interface Context { }
-	export interface ScriptOptions {
-		filename?: string;
-		lineOffset?: number;
-		columnOffset?: number;
-		displayErrors?: boolean;
-		timeout?: number;
-		cachedData?: Buffer;
-		produceCachedData?: boolean;
-	}
-	export interface RunningScriptOptions {
-		filename?: string;
-		lineOffset?: number;
-		columnOffset?: number;
-		displayErrors?: boolean;
-		timeout?: number;
-	}
-	export class Script {
-		constructor(code: string, options?: ScriptOptions);
-		runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-		runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
-		runInThisContext(options?: RunningScriptOptions): any;
-	}
-	export function createContext(sandbox?: Context): Context;
-	export function isContext(sandbox: Context): boolean;
-	export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-	export function runInDebugContext(code: string): any;
-	export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
-	export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+    export interface Context { }
+    export interface ScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+        cachedData?: Buffer;
+        produceCachedData?: boolean;
+    }
+    export interface RunningScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+    }
+    export class Script {
+        constructor(code: string, options?: ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
+        runInThisContext(options?: RunningScriptOptions): any;
+    }
+    export function createContext(sandbox?: Context): Context;
+    export function isContext(sandbox: Context): boolean;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+    export function runInDebugContext(code: string): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
+    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
 }
 
 declare module "child_process" {
-	import * as events from "events";
-	import * as stream from "stream";
-	import * as net from "net";
+    import * as events from "events";
+    import * as stream from "stream";
+    import * as net from "net";
 
-	export interface ChildProcess extends events.EventEmitter {
-		stdin: stream.Writable;
-		stdout: stream.Readable;
-		stderr: stream.Readable;
-		stdio: [stream.Writable, stream.Readable, stream.Readable];
-		killed: boolean;
-		pid: number;
-		kill(signal?: string): void;
-		send(message: any, sendHandle?: any): boolean;
-		connected: boolean;
-		disconnect(): void;
-		unref(): void;
-		ref(): void;
+    export interface ChildProcess extends events.EventEmitter {
+        stdin: stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: [stream.Writable, stream.Readable, stream.Readable];
+        killed: boolean;
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, options?: MessageOptions, callback?: (error: Error) => void): boolean;
+        connected: boolean;
+        disconnect(): void;
+        unref(): void;
+        ref(): void;
 
         /**
          * events.EventEmitter
@@ -1667,464 +2024,610 @@ declare module "child_process" {
          * 3. error
          * 4. exit
          * 5. message
-         **/
+         */
 
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: (code: number, signal: string) => void): this;
-		addListener(event: "disconnect", listener: () => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (code: number, signal: string) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close", code: number, signal: string): boolean;
-		emit(event: "disconnect"): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "exit", code: number, signal: string): boolean;
-		emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", code: number, signal: string): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: (code: number, signal: string) => void): this;
-		on(event: "disconnect", listener: () => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "exit", listener: (code: number, signal: string) => void): this;
-		on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (code: number, signal: string) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: (code: number, signal: string) => void): this;
-		once(event: "disconnect", listener: () => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "exit", listener: (code: number, signal: string) => void): this;
-		once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (code: number, signal: string) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: (code: number, signal: string) => void): this;
-		prependListener(event: "disconnect", listener: () => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
-		prependOnceListener(event: "disconnect", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+    }
 
-	export interface SpawnOptions {
-		cwd?: string;
-		env?: any;
-		stdio?: any;
-		detached?: boolean;
-		uid?: number;
-		gid?: number;
-		shell?: boolean | string;
-		windowsVerbatimArguments?: boolean;
-	}
-	export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
+    export interface MessageOptions {
+        keepOpen?: boolean;
+    }
 
-	export interface ExecOptions {
-		cwd?: string;
-		env?: any;
-		shell?: string;
-		timeout?: number;
-		maxBuffer?: number;
-		killSignal?: string;
-		uid?: number;
-		gid?: number;
-	}
-	export interface ExecOptionsWithStringEncoding extends ExecOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecOptionsWithBufferEncoding extends ExecOptions {
-		encoding: string; // specify `null`.
-	}
-	export function exec(command: string, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function exec(command: string, options: ExecOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	// usage. child_process.exec("tsc", {encoding: null as string}, (err, stdout, stderr) => {});
-	export function exec(command: string, options: ExecOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-	export function exec(command: string, options: ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export interface SpawnOptions {
+        cwd?: string;
+        env?: any;
+        stdio?: any;
+        detached?: boolean;
+        uid?: number;
+        gid?: number;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+    }
 
-	export interface ExecFileOptions {
-		cwd?: string;
-		env?: any;
-		timeout?: number;
-		maxBuffer?: number;
-		killSignal?: string;
-		uid?: number;
-		gid?: number;
-	}
-	export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
-		encoding: string; // specify `null`.
-	}
-	export function execFile(file: string, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function execFile(file: string, options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	// usage. child_process.execFile("file.sh", {encoding: null as string}, (err, stdout, stderr) => {});
-	export function execFile(file: string, options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-	export function execFile(file: string, options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function execFile(file: string, args?: string[], callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	// usage. child_process.execFile("file.sh", ["foo"], {encoding: null as string}, (err, stdout, stderr) => {});
-	export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-	export function execFile(file: string, args?: string[], options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
 
-	export interface ForkOptions {
-		cwd?: string;
-		env?: any;
-		execPath?: string;
-		execArgv?: string[];
-		silent?: boolean;
-		stdio?: any[];
-		uid?: number;
-		gid?: number;
-	}
-	export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+    export interface ExecOptions {
+        cwd?: string;
+        env?: any;
+        shell?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+    }
 
-	export interface SpawnSyncOptions {
-		cwd?: string;
-		input?: string | Buffer;
-		stdio?: any;
-		env?: any;
-		uid?: number;
-		gid?: number;
-		timeout?: number;
-		killSignal?: string;
-		maxBuffer?: number;
-		encoding?: string;
-		shell?: boolean | string;
-	}
-	export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
-		encoding: BufferEncoding;
-	}
-	export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
-		encoding: string; // specify `null`.
-	}
-	export interface SpawnSyncReturns<T> {
-		pid: number;
-		output: string[];
-		stdout: T;
-		stderr: T;
-		status: number;
-		signal: string;
-		error: Error;
-	}
-	export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-	export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-	export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export interface ExecOptionsWithStringEncoding extends ExecOptions {
+        encoding: BufferEncoding;
+    }
 
-	export interface ExecSyncOptions {
-		cwd?: string;
-		input?: string | Buffer;
-		stdio?: any;
-		env?: any;
-		shell?: string;
-		uid?: number;
-		gid?: number;
-		timeout?: number;
-		killSignal?: string;
-		maxBuffer?: number;
-		encoding?: string;
-	}
-	export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
-		encoding: string; // specify `null`.
-	}
-	export function execSync(command: string): Buffer;
-	export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
-	export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
-	export function execSync(command: string, options?: ExecSyncOptions): Buffer;
+    export interface ExecOptionsWithBufferEncoding extends ExecOptions {
+        encoding: string | null; // specify `null`.
+    }
 
-	export interface ExecFileSyncOptions {
-		cwd?: string;
-		input?: string | Buffer;
-		stdio?: any;
-		env?: any;
-		uid?: number;
-		gid?: number;
-		timeout?: number;
-		killSignal?: string;
-		maxBuffer?: number;
-		encoding?: string;
-	}
-	export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
-		encoding: string; // specify `null`.
-	}
-	export function execFileSync(command: string): Buffer;
-	export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
-	export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-	export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
-	export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
-	export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-	export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
+    // no `options` definitely means stdout/stderr are `string`.
+    export function exec(command: string, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    export function exec(command: string, options: { encoding: "buffer" | null } & ExecOptions, callback?: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    export function exec(command: string, options: { encoding: BufferEncoding } & ExecOptions, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    export function exec(command: string, options: { encoding: string } & ExecOptions, callback?: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    export function exec(command: string, options: ExecOptions, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    export function exec(command: string, options: ({ encoding?: string | null } & ExecOptions) | undefined | null, callback?: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace exec {
+        export function __promisify__(command: string): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options: ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options?: ({ encoding?: string | null } & ExecOptions) | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    export interface ExecFileOptions {
+        cwd?: string;
+        env?: any;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+        windowsVerbatimArguments?: boolean;
+    }
+    export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
+        encoding: 'buffer' | null;
+    }
+    export interface ExecFileOptionsWithOtherEncoding extends ExecFileOptions {
+        encoding: string;
+    }
+
+    export function execFile(file: string): ChildProcess;
+    export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+
+    // no `options` definitely means stdout/stderr are `string`.
+    export function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    export function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    export function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    export function execFile(file: string, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    export function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace execFile {
+        export function __promisify__(file: string): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    export interface ForkOptions {
+        cwd?: string;
+        env?: any;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+        windowsVerbatimArguments?: boolean;
+    }
+    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+
+    export interface SpawnSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+    }
+    export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export interface SpawnSyncReturns<T> {
+        pid: number;
+        output: string[];
+        stdout: T;
+        stderr: T;
+        status: number;
+        signal: string;
+        error: Error;
+    }
+    export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+
+    export interface ExecSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        shell?: string;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execSync(command: string): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
+    export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptions): Buffer;
+
+    export interface ExecFileSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execFileSync(command: string): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
 }
 
 declare module "url" {
-	export interface Url {
-		href?: string;
-		protocol?: string;
-		auth?: string;
-		hostname?: string;
-		port?: string;
-		host?: string;
-		pathname?: string;
-		search?: string;
-		query?: string | any;
-		slashes?: boolean;
-		hash?: string;
-		path?: string;
-	}
+    import { ParsedUrlQuery } from 'querystring';
 
-	export interface UrlObject {
-		protocol?: string;
-		slashes?: boolean;
-		auth?: string;
-		host?: string;
-		hostname?: string;
-		port?: string | number;
-		pathname?: string;
-		search?: string;
-		query?: { [key: string]: any; };
-		hash?: string;
-	}
+    export interface UrlObjectCommon {
+        auth?: string;
+        hash?: string;
+        host?: string;
+        hostname?: string;
+        href?: string;
+        path?: string;
+        pathname?: string;
+        protocol?: string;
+        search?: string;
+        slashes?: boolean;
+    }
 
-	export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
-	export function format(URL: URL, options?: URLFormatOptions): string;
-	export function format(urlObject: UrlObject): string;
-	export function resolve(from: string, to: string): string;
+    // Input to `url.format`
+    export interface UrlObject extends UrlObjectCommon {
+        port?: string | number;
+        query?: string | null | { [key: string]: any };
+    }
 
-	export interface URLFormatOptions {
-		auth?: boolean;
-		fragment?: boolean;
-		search?: boolean;
-		unicode?: boolean;
-	}
+    // Output of `url.parse`
+    export interface Url extends UrlObjectCommon {
+        port?: string;
+        query?: string | null | ParsedUrlQuery;
+    }
 
-	export class URLSearchParams implements Iterable<string[]> {
-		constructor(init?: URLSearchParams | string | { [key: string]: string | string[] } | Iterable<string[]>);
-		append(name: string, value: string): void;
-		delete(name: string): void;
-		entries(): Iterator<string[]>;
-		forEach(callback: (value: string, name: string) => void): void;
-		get(name: string): string | null;
-		getAll(name: string): string[];
-		has(name: string): boolean;
-		keys(): Iterator<string>;
-		set(name: string, value: string): void;
-		sort(): void;
-		toString(): string;
-		values(): Iterator<string>;
-		[Symbol.iterator](): Iterator<string[]>;
-	}
+    export interface UrlWithParsedQuery extends Url {
+        query: ParsedUrlQuery;
+    }
 
-	export class URL {
-		constructor(input: string, base?: string | URL);
-		hash: string;
-		host: string;
-		hostname: string;
-		href: string;
-		readonly origin: string;
-		password: string;
-		pathname: string;
-		port: string;
-		protocol: string;
-		search: string;
-		readonly searchParams: URLSearchParams;
-		username: string;
-		toString(): string;
-		toJSON(): string;
-	}
+    export interface UrlWithStringQuery extends Url {
+        query: string | null;
+    }
+
+    export function parse(urlStr: string): UrlWithStringQuery;
+    export function parse(urlStr: string, parseQueryString: false | undefined, slashesDenoteHost?: boolean): UrlWithStringQuery;
+    export function parse(urlStr: string, parseQueryString: true, slashesDenoteHost?: boolean): UrlWithParsedQuery;
+    export function parse(urlStr: string, parseQueryString: boolean, slashesDenoteHost?: boolean): Url;
+
+    export function format(URL: URL, options?: URLFormatOptions): string;
+    export function format(urlObject: UrlObject | string): string;
+    export function resolve(from: string, to: string): string;
+
+    export interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
+    export class URLSearchParams implements Iterable<[string, string]> {
+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        entries(): IterableIterator<[string, string]>;
+        forEach(callback: (value: string, name: string) => void): void;
+        get(name: string): string | null;
+        getAll(name: string): string[];
+        has(name: string): boolean;
+        keys(): IterableIterator<string>;
+        set(name: string, value: string): void;
+        sort(): void;
+        toString(): string;
+        values(): IterableIterator<string>;
+        [Symbol.iterator](): IterableIterator<[string, string]>;
+    }
+
+    export class URL {
+        constructor(input: string, base?: string | URL);
+        hash: string;
+        host: string;
+        hostname: string;
+        href: string;
+        readonly origin: string;
+        password: string;
+        pathname: string;
+        port: string;
+        protocol: string;
+        search: string;
+        readonly searchParams: URLSearchParams;
+        username: string;
+        toString(): string;
+        toJSON(): string;
+    }
 }
 
 declare module "dns" {
-	// Supported getaddrinfo flags.
-	export const ADDRCONFIG: number;
-	export const V4MAPPED: number;
+    // Supported getaddrinfo flags.
+    export const ADDRCONFIG: number;
+    export const V4MAPPED: number;
 
-	export interface LookupOptions {
-		family?: number;
-		hints?: number;
-		all?: boolean;
-	}
+    export interface LookupOptions {
+        family?: number;
+        hints?: number;
+        all?: boolean;
+    }
 
-	export interface LookupOneOptions extends LookupOptions {
-		all?: false;
-	}
+    export interface LookupOneOptions extends LookupOptions {
+        all?: false;
+    }
 
-	export interface LookupAllOptions extends LookupOptions {
-		all: true;
-	}
+    export interface LookupAllOptions extends LookupOptions {
+        all: true;
+    }
 
-	export interface LookupAddress {
-		address: string;
-		family: number;
-	}
+    export interface LookupAddress {
+        address: string;
+        family: number;
+    }
 
-	export function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
-	export function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
-	export function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
-	export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
-	export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
+    export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
+    export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
 
-	export interface ResolveOptions {
-		ttl: boolean;
-	}
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lookup {
+        export function __promisify__(hostname: string, options: LookupAllOptions): Promise<{ address: LookupAddress[] }>;
+        export function __promisify__(hostname: string, options?: LookupOneOptions | number): Promise<{ address: string, family: number }>;
+        export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
+    }
 
-	export interface ResolveWithTtlOptions extends ResolveOptions {
-		ttl: true;
-	}
+    export interface ResolveOptions {
+        ttl: boolean;
+    }
 
-	export interface RecordWithTtl {
-		address: string;
-		ttl: number;
-	}
+    export interface ResolveWithTtlOptions extends ResolveOptions {
+        ttl: true;
+    }
 
-	export interface MxRecord {
-		priority: number;
-		exchange: string;
-	}
+    export interface RecordWithTtl {
+        address: string;
+        ttl: number;
+    }
 
-	export interface NaptrRecord {
-		flags: string;
-		service: string;
-		regexp: string;
-		replacement: string;
-		order: number;
-		preference: number;
-	}
+    export interface MxRecord {
+        priority: number;
+        exchange: string;
+    }
 
-	export interface SoaRecord {
-		nsname: string;
-		hostmaster: string;
-		serial: number;
-		refresh: number;
-		retry: number;
-		expire: number;
-		minttl: number;
-	}
+    export interface NaptrRecord {
+        flags: string;
+        service: string;
+        regexp: string;
+        replacement: string;
+        order: number;
+        preference: number;
+    }
 
-	export interface SrvRecord {
-		priority: number;
-		weight: number;
-		port: number;
-		name: string;
-	}
+    export interface SoaRecord {
+        nsname: string;
+        hostmaster: string;
+        serial: number;
+        refresh: number;
+        retry: number;
+        expire: number;
+        minttl: number;
+    }
 
-	export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-	export function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-	export function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
-	export function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
-	export function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
-	export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]) => void): void;
+    export interface SrvRecord {
+        priority: number;
+        weight: number;
+        port: number;
+        name: string;
+    }
 
-	export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
-	export function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+    export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
+    export function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]) => void): void;
 
-	export function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
-	export function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve {
+        export function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
+        export function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
+        export function __promisify__(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "TXT"): Promise<string[][]>;
+        export function __promisify__(hostname: string, rrtype?: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]>;
+    }
 
-	export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-	export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-	export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
-	export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
-	export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
 
-	export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
-	export function setServers(servers: string[]): void;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve4 {
+        export function __promisify__(hostname: string): Promise<string[]>;
+        export function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        export function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
 
-	//Error codes
-	export var NODATA: string;
-	export var FORMERR: string;
-	export var SERVFAIL: string;
-	export var NOTFOUND: string;
-	export var NOTIMP: string;
-	export var REFUSED: string;
-	export var BADQUERY: string;
-	export var BADNAME: string;
-	export var BADFAMILY: string;
-	export var BADRESP: string;
-	export var CONNREFUSED: string;
-	export var TIMEOUT: string;
-	export var EOF: string;
-	export var FILE: string;
-	export var NOMEM: string;
-	export var DESTRUCTION: string;
-	export var BADSTR: string;
-	export var BADFLAGS: string;
-	export var NONAME: string;
-	export var BADHINTS: string;
-	export var NOTINITIALIZED: string;
-	export var LOADIPHLPAPI: string;
-	export var ADDRGETNETWORKPARAMS: string;
-	export var CANCELLED: string;
+    export function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve6 {
+        export function __promisify__(hostname: string): Promise<string[]>;
+        export function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        export function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+
+    export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
+    export function setServers(servers: string[]): void;
+
+    // Error codes
+    export var NODATA: string;
+    export var FORMERR: string;
+    export var SERVFAIL: string;
+    export var NOTFOUND: string;
+    export var NOTIMP: string;
+    export var REFUSED: string;
+    export var BADQUERY: string;
+    export var BADNAME: string;
+    export var BADFAMILY: string;
+    export var BADRESP: string;
+    export var CONNREFUSED: string;
+    export var TIMEOUT: string;
+    export var EOF: string;
+    export var FILE: string;
+    export var NOMEM: string;
+    export var DESTRUCTION: string;
+    export var BADSTR: string;
+    export var BADFLAGS: string;
+    export var NONAME: string;
+    export var BADHINTS: string;
+    export var NOTINITIALIZED: string;
+    export var LOADIPHLPAPI: string;
+    export var ADDRGETNETWORKPARAMS: string;
+    export var CANCELLED: string;
 }
 
 declare module "net" {
-	import * as stream from "stream";
-	import * as events from "events";
+    import * as stream from "stream";
+    import * as events from "events";
+    import * as dns from "dns";
 
-	export interface Socket extends stream.Duplex {
-		// Extended base methods
-		write(buffer: Buffer): boolean;
-		write(buffer: Buffer, cb?: Function): boolean;
-		write(str: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, fd?: string): boolean;
+    type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
 
-		connect(port: number, host?: string, connectionListener?: Function): void;
-		connect(path: string, connectionListener?: Function): void;
-		bufferSize: number;
-		setEncoding(encoding?: string): this;
-		write(data: any, encoding?: string, callback?: Function): void;
-		destroy(err?: any): void;
-		pause(): this;
-		resume(): this;
-		setTimeout(timeout: number, callback?: Function): void;
-		setNoDelay(noDelay?: boolean): void;
-		setKeepAlive(enable?: boolean, initialDelay?: number): void;
-		address(): { port: number; family: string; address: string; };
-		unref(): void;
-		ref(): void;
+    export interface SocketConstructorOpts {
+        fd?: number;
+        allowHalfOpen?: boolean;
+        readable?: boolean;
+        writable?: boolean;
+    }
 
-		remoteAddress: string;
-		remoteFamily: string;
-		remotePort: number;
-		localAddress: string;
-		localPort: number;
-		bytesRead: number;
-		bytesWritten: number;
-		connecting: boolean;
-		destroyed: boolean;
+    export interface TcpSocketConnectOpts {
+        port: number;
+        host?: string;
+        localAddress?: string;
+        localPort?: number;
+        hints?: number;
+        family?: number;
+        lookup?: LookupFunction;
+    }
 
-		// Extended base methods
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-		end(data?: any, encoding?: string): void;
+    export interface IpcSocketConnectOpts {
+        path: string;
+    }
+
+    export type SocketConnectOpts = TcpSocketConnectOpts | IpcSocketConnectOpts;
+
+    export class Socket extends stream.Duplex {
+        constructor(options?: SocketConstructorOpts);
+
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+        write(data: any, encoding?: string, callback?: Function): void;
+
+        connect(options: SocketConnectOpts, connectionListener?: Function): this;
+        connect(port: number, host: string, connectionListener?: Function): this;
+        connect(port: number, connectionListener?: Function): this;
+        connect(path: string, connectionListener?: Function): this;
+
+        bufferSize: number;
+        setEncoding(encoding?: string): this;
+        destroy(err?: any): void;
+        pause(): this;
+        resume(): this;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
+        address(): { port: number; family: string; address: string; };
+        unref(): void;
+        ref(): void;
+
+        remoteAddress?: string;
+        remoteFamily?: string;
+        remotePort?: number;
+        localAddress: string;
+        localPort: number;
+        bytesRead: number;
+        bytesWritten: number;
+        connecting: boolean;
+        destroyed: boolean;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
 
         /**
          * events.EventEmitter
@@ -2137,97 +2640,97 @@ declare module "net" {
          *   7. lookup
          *   8. timeout
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: (had_error: boolean) => void): this;
-		addListener(event: "connect", listener: () => void): this;
-		addListener(event: "data", listener: (data: Buffer) => void): this;
-		addListener(event: "drain", listener: () => void): this;
-		addListener(event: "end", listener: () => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		addListener(event: "timeout", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (had_error: boolean) => void): this;
+        addListener(event: "connect", listener: () => void): this;
+        addListener(event: "data", listener: (data: Buffer) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close", had_error: boolean): boolean;
-		emit(event: "connect"): boolean;
-		emit(event: "data", data: Buffer): boolean;
-		emit(event: "drain"): boolean;
-		emit(event: "end"): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
-		emit(event: "timeout"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", had_error: boolean): boolean;
+        emit(event: "connect"): boolean;
+        emit(event: "data", data: Buffer): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
+        emit(event: "timeout"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: (had_error: boolean) => void): this;
-		on(event: "connect", listener: () => void): this;
-		on(event: "data", listener: (data: Buffer) => void): this;
-		on(event: "drain", listener: () => void): this;
-		on(event: "end", listener: () => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		on(event: "timeout", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (had_error: boolean) => void): this;
+        on(event: "connect", listener: () => void): this;
+        on(event: "data", listener: (data: Buffer) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        on(event: "timeout", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: (had_error: boolean) => void): this;
-		once(event: "connect", listener: () => void): this;
-		once(event: "data", listener: (data: Buffer) => void): this;
-		once(event: "drain", listener: () => void): this;
-		once(event: "end", listener: () => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		once(event: "timeout", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (had_error: boolean) => void): this;
+        once(event: "connect", listener: () => void): this;
+        once(event: "data", listener: (data: Buffer) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        once(event: "timeout", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: (had_error: boolean) => void): this;
-		prependListener(event: "connect", listener: () => void): this;
-		prependListener(event: "data", listener: (data: Buffer) => void): this;
-		prependListener(event: "drain", listener: () => void): this;
-		prependListener(event: "end", listener: () => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependListener(event: "connect", listener: () => void): this;
+        prependListener(event: "data", listener: (data: Buffer) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
-		prependOnceListener(event: "connect", listener: () => void): this;
-		prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
-		prependOnceListener(event: "drain", listener: () => void): this;
-		prependOnceListener(event: "end", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		prependOnceListener(event: "timeout", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependOnceListener(event: "connect", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
 
-	export var Socket: {
-		new(options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket;
-	};
+    export interface ListenOptions {
+        port?: number;
+        host?: string;
+        backlog?: number;
+        path?: string;
+        exclusive?: boolean;
+    }
 
-	export interface ListenOptions {
-		port?: number;
-		host?: string;
-		backlog?: number;
-		path?: string;
-		exclusive?: boolean;
-	}
+    // https://github.com/nodejs/node/blob/master/lib/net.js
+    export class Server extends events.EventEmitter {
+        constructor(connectionListener?: (socket: Socket) => void);
+        constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
 
-	export interface Server extends events.EventEmitter {
-		listen(port: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
-		listen(port: number, hostname?: string, listeningListener?: Function): Server;
-		listen(port: number, backlog?: number, listeningListener?: Function): Server;
-		listen(port: number, listeningListener?: Function): Server;
-		listen(path: string, backlog?: number, listeningListener?: Function): Server;
-		listen(path: string, listeningListener?: Function): Server;
-		listen(options: ListenOptions, listeningListener?: Function): Server;
-		listen(handle: any, backlog?: number, listeningListener?: Function): Server;
-		listen(handle: any, listeningListener?: Function): Server;
-		close(callback?: Function): Server;
-		address(): { port: number; family: string; address: string; };
-		getConnections(cb: (error: Error, count: number) => void): void;
-		ref(): Server;
-		unref(): Server;
-		maxConnections: number;
-		connections: number;
-		listening: boolean;
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, hostname?: string, listeningListener?: Function): this;
+        listen(port?: number, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, listeningListener?: Function): this;
+        listen(path: string, backlog?: number, listeningListener?: Function): this;
+        listen(path: string, listeningListener?: Function): this;
+        listen(options: ListenOptions, listeningListener?: Function): this;
+        listen(handle: any, backlog?: number, listeningListener?: Function): this;
+        listen(handle: any, listeningListener?: Function): this;
+        close(callback?: Function): this;
+        address(): { port: number; family: string; address: string; };
+        getConnections(cb: (error: Error | null, count: number) => void): void;
+        ref(): this;
+        unref(): this;
+        maxConnections: number;
+        connections: number;
+        listening: boolean;
 
         /**
          * events.EventEmitter
@@ -2236,101 +2739,123 @@ declare module "net" {
          *   3. error
          *   4. listening
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: () => void): this;
-		addListener(event: "connection", listener: (socket: Socket) => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "listening", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "connection", listener: (socket: Socket) => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close"): boolean;
-		emit(event: "connection", socket: Socket): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "listening"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "connection", socket: Socket): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: () => void): this;
-		on(event: "connection", listener: (socket: Socket) => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "listening", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "connection", listener: (socket: Socket) => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: () => void): this;
-		once(event: "connection", listener: (socket: Socket) => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "listening", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "connection", listener: (socket: Socket) => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: () => void): this;
-		prependListener(event: "connection", listener: (socket: Socket) => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "listening", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-		prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "listening", listener: () => void): this;
-	}
-	export function createServer(connectionListener?: (socket: Socket) => void): Server;
-	export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
-	export function connect(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
-	export function connect(port: number, host?: string, connectionListener?: Function): Socket;
-	export function connect(path: string, connectionListener?: Function): Socket;
-	export function createConnection(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
-	export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
-	export function createConnection(path: string, connectionListener?: Function): Socket;
-	export function isIP(input: string): number;
-	export function isIPv4(input: string): boolean;
-	export function isIPv6(input: string): boolean;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+    }
+
+    export interface TcpNetConnectOpts extends TcpSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export interface IpcNetConnectOpts extends IpcSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export type NetConnectOpts = TcpNetConnectOpts | IpcNetConnectOpts;
+
+    export function createServer(connectionListener?: (socket: Socket) => void): Server;
+    export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
+    export function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
+    export function connect(port: number, host?: string, connectionListener?: Function): Socket;
+    export function connect(path: string, connectionListener?: Function): Socket;
+    export function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
+    export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
+    export function createConnection(path: string, connectionListener?: Function): Socket;
+    export function isIP(input: string): number;
+    export function isIPv4(input: string): boolean;
+    export function isIPv6(input: string): boolean;
 }
 
 declare module "dgram" {
-	import * as events from "events";
+    import * as events from "events";
+    import * as dns from "dns";
 
-	interface RemoteInfo {
-		address: string;
-		family: string;
-		port: number;
-	}
+    interface RemoteInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
 
-	interface AddressInfo {
-		address: string;
-		family: string;
-		port: number;
-	}
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
 
-	interface BindOptions {
-		port: number;
-		address?: string;
-		exclusive?: boolean;
-	}
+    interface BindOptions {
+        port: number;
+        address?: string;
+        exclusive?: boolean;
+    }
 
-	type SocketType = "udp4" | "udp6";
+    type SocketType = "udp4" | "udp6";
 
-	interface SocketOptions {
-		type: SocketType;
-		reuseAddr?: boolean;
-	}
+    interface SocketOptions {
+        type: SocketType;
+        reuseAddr?: boolean;
+        recvBufferSize?: number;
+        sendBufferSize?: number;
+        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
+    }
 
-	export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
-	export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
 
-	export interface Socket extends events.EventEmitter {
-		send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
-		send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
-		bind(port?: number, address?: string, callback?: () => void): void;
-		bind(options: BindOptions, callback?: Function): void;
-		close(callback?: () => void): void;
-		address(): AddressInfo;
-		setBroadcast(flag: boolean): void;
-		setTTL(ttl: number): void;
-		setMulticastTTL(ttl: number): void;
-		setMulticastLoopback(flag: boolean): void;
-		addMembership(multicastAddress: string, multicastInterface?: string): void;
-		dropMembership(multicastAddress: string, multicastInterface?: string): void;
-		ref(): this;
-		unref(): this;
+    export class Socket extends events.EventEmitter {
+        send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
+        bind(port?: number, address?: string, callback?: () => void): void;
+        bind(port?: number, callback?: () => void): void;
+        bind(callback?: () => void): void;
+        bind(options: BindOptions, callback?: Function): void;
+        close(callback?: () => void): void;
+        address(): AddressInfo;
+        setBroadcast(flag: boolean): void;
+        setTTL(ttl: number): void;
+        setMulticastTTL(ttl: number): void;
+        setMulticastInterface(multicastInterface: string): void;
+        setMulticastLoopback(flag: boolean): void;
+        addMembership(multicastAddress: string, multicastInterface?: string): void;
+        dropMembership(multicastAddress: string, multicastInterface?: string): void;
+        ref(): this;
+        unref(): this;
+        setRecvBufferSize(size: number): void;
+        setSendBufferSize(size: number): void;
+        getRecvBufferSize(): number;
+        getSendBufferSize(): number;
 
         /**
          * events.EventEmitter
@@ -2338,586 +2863,1736 @@ declare module "dgram" {
          * 2. error
          * 3. listening
          * 4. message
-         **/
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: () => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "listening", listener: () => void): this;
-		addListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+        addListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close"): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "listening"): boolean;
-		emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+        emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: () => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "listening", listener: () => void): this;
-		on(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+        on(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: () => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "listening", listener: () => void): this;
-		once(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+        once(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: () => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "listening", listener: () => void): this;
-		prependListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+        prependListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "listening", listener: () => void): this;
-		prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+    }
 }
 
 declare module "fs" {
-	import * as stream from "stream";
-	import * as events from "events";
+    import * as stream from "stream";
+    import * as events from "events";
+    import { URL } from "url";
 
-	interface Stats {
-		isFile(): boolean;
-		isDirectory(): boolean;
-		isBlockDevice(): boolean;
-		isCharacterDevice(): boolean;
-		isSymbolicLink(): boolean;
-		isFIFO(): boolean;
-		isSocket(): boolean;
-		dev: number;
-		ino: number;
-		mode: number;
-		nlink: number;
-		uid: number;
-		gid: number;
-		rdev: number;
-		size: number;
-		blksize: number;
-		blocks: number;
-		atime: Date;
-		mtime: Date;
-		ctime: Date;
-		birthtime: Date;
-	}
+    /**
+     * Valid types for path values in "fs".
+     */
+    export type PathLike = string | Buffer | URL;
 
-	interface FSWatcher extends events.EventEmitter {
-		close(): void;
+    export class Stats {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        dev: number;
+        ino: number;
+        mode: number;
+        nlink: number;
+        uid: number;
+        gid: number;
+        rdev: number;
+        size: number;
+        blksize: number;
+        blocks: number;
+        atimeMs: number;
+        mtimeMs: number;
+        ctimeMs: number;
+        birthtimeMs: number;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    export interface FSWatcher extends events.EventEmitter {
+        close(): void;
 
         /**
          * events.EventEmitter
          *   1. change
          *   2. error
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
 
-		on(event: string, listener: Function): this;
-		on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		on(event: "error", listener: (error: Error) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		once(event: "error", listener: (error: Error) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		prependOnceListener(event: "error", listener: (error: Error) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+    }
 
-	export interface ReadStream extends stream.Readable {
-		close(): void;
-		destroy(): void;
-		bytesRead: number;
-		path: string | Buffer;
+    export class ReadStream extends stream.Readable {
+        close(): void;
+        destroy(): void;
+        bytesRead: number;
+        path: string | Buffer;
 
         /**
          * events.EventEmitter
          *   1. open
          *   2. close
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "open", listener: (fd: number) => void): this;
-		addListener(event: "close", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
 
-		on(event: string, listener: Function): this;
-		on(event: "open", listener: (fd: number) => void): this;
-		on(event: "close", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "open", listener: (fd: number) => void): this;
-		once(event: "close", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "open", listener: (fd: number) => void): this;
-		prependListener(event: "close", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "open", listener: (fd: number) => void): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
 
-	export interface WriteStream extends stream.Writable {
-		close(): void;
-		bytesWritten: number;
-		path: string | Buffer;
+    export class WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+        path: string | Buffer;
 
         /**
          * events.EventEmitter
          *   1. open
          *   2. close
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "open", listener: (fd: number) => void): this;
-		addListener(event: "close", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
 
-		on(event: string, listener: Function): this;
-		on(event: "open", listener: (fd: number) => void): this;
-		on(event: "close", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "open", listener: (fd: number) => void): this;
-		once(event: "close", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "open", listener: (fd: number) => void): this;
-		prependListener(event: "close", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "open", listener: (fd: number) => void): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
 
     /**
-     * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
      */
-	export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function rename(oldPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace rename {
+        /**
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        export function __promisify__(oldPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
     /**
-     * Synchronous rename
-     * @param oldPath
-     * @param newPath
+     * Synchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
      */
-	export function renameSync(oldPath: string, newPath: string): void;
-	export function truncate(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function truncate(path: string | Buffer, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function truncateSync(path: string | Buffer, len?: number): void;
-	export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function ftruncateSync(fd: number, len?: number): void;
-	export function chown(path: string | Buffer, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function chownSync(path: string | Buffer, uid: number, gid: number): void;
-	export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fchownSync(fd: number, uid: number, gid: number): void;
-	export function lchown(path: string | Buffer, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function lchownSync(path: string | Buffer, uid: number, gid: number): void;
-	export function chmod(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function chmod(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function chmodSync(path: string | Buffer, mode: number): void;
-	export function chmodSync(path: string | Buffer, mode: string): void;
-	export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fchmodSync(fd: number, mode: number): void;
-	export function fchmodSync(fd: number, mode: string): void;
-	export function lchmod(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function lchmod(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function lchmodSync(path: string | Buffer, mode: number): void;
-	export function lchmodSync(path: string | Buffer, mode: string): void;
-	export function stat(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-	export function lstat(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-	export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-	export function statSync(path: string | Buffer): Stats;
-	export function lstatSync(path: string | Buffer): Stats;
-	export function fstatSync(fd: number): Stats;
-	export function link(srcpath: string | Buffer, dstpath: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function linkSync(srcpath: string | Buffer, dstpath: string | Buffer): void;
-	export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function symlinkSync(srcpath: string | Buffer, dstpath: string | Buffer, type?: string): void;
-	export function readlink(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
-	export function readlinkSync(path: string | Buffer): string;
-	export function realpath(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-	export function realpath(path: string | Buffer, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-	export function realpathSync(path: string | Buffer, cache?: { [path: string]: string }): string;
+    export function renameSync(oldPath: PathLike, newPath: PathLike): void;
+
     /**
-     * Asynchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
      */
-	export function unlink(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncate(path: PathLike, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
     /**
-     * Synchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
      */
-	export function unlinkSync(path: string | Buffer): void;
+    export function truncate(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace truncate {
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        export function __promisify__(path: PathLike, len?: number | null): Promise<void>;
+    }
+
     /**
-     * Asynchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Synchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
      */
-	export function rmdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncateSync(path: PathLike, len?: number | null): void;
+
     /**
-     * Synchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
      */
-	export function rmdirSync(path: string | Buffer): void;
+    export function ftruncate(fd: number, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
     /**
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
      */
-	export function mkdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace ftruncate {
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param fd A file descriptor.
+         * @param len If not specified, defaults to `0`.
+         */
+        export function __promisify__(fd: number, len?: number | null): Promise<void>;
+    }
+
     /**
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Synchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
      */
-	export function mkdir(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncateSync(fd: number, len?: number | null): void;
+
     /**
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function mkdir(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace chown {
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
     /**
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Synchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function mkdirSync(path: string | Buffer, mode?: number): void;
+    export function chownSync(path: PathLike, uid: number, gid: number): void;
+
     /**
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
      */
-	export function mkdirSync(path: string | Buffer, mode?: string): void;
+    export function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fchown {
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number, uid: number, gid: number): Promise<void>;
+    }
+
     /**
-     * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     *
-     * @param prefix
-     * @param callback The created folder path is passed as a string to the callback's second parameter.
+     * Synchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
      */
-	export function mkdtemp(prefix: string, callback?: (err: NodeJS.ErrnoException, folder: string) => void): void;
+    export function fchownSync(fd: number, uid: number, gid: number): void;
+
     /**
-     * Synchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     *
-     * @param prefix
-     * @returns Returns the created folder path.
+     * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function mkdtempSync(prefix: string): string;
-	export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-	export function readdir(path: string | Buffer, options: string | {}, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-	export function readdirSync(path: string | Buffer, options?: string | {}): string[];
-	export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function closeSync(fd: number): void;
-	export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
-	export function open(path: string | Buffer, flags: string | number, mode: number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
-	export function openSync(path: string | Buffer, flags: string | number, mode?: number): number;
-	export function utimes(path: string | Buffer, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function utimes(path: string | Buffer, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function utimesSync(path: string | Buffer, atime: number, mtime: number): void;
-	export function utimesSync(path: string | Buffer, atime: Date, mtime: Date): void;
-	export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function futimesSync(fd: number, atime: number, mtime: number): void;
-	export function futimesSync(fd: number, atime: Date, mtime: Date): void;
-	export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fsyncSync(fd: number): void;
-	export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-	export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-	export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-	export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-	export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-	export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position?: number | null): number;
-	export function writeSync(fd: number, data: any, position?: number | null, enconding?: string): number;
-	export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
-	export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number | null): number;
+    export function lchown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lchown {
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Synchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function readFile(filename: string, encoding: null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-	export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-	export function readFile(filename: string, encoding: string | null, callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void): void;
+    export function lchownSync(path: PathLike, uid: number, gid: number): void;
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Asynchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFile(filename: string, options: { encoding: null; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-	export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-	export function readFile(filename: string, options: { encoding: string | null; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void): void;
+    export function chmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace chmod {
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Synchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    export function chmodSync(path: PathLike, mode: string | number): void;
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Asynchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    export function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fchmod {
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param fd A file descriptor.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(fd: number, mode: string | number): Promise<void>;
+    }
+
     /**
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
+     * Synchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFileSync(filename: string, encoding: null): Buffer;
-	export function readFileSync(filename: string, encoding: string): string;
-	export function readFileSync(filename: string, encoding: string | null): string | Buffer;
+    export function fchmodSync(fd: number, mode: string | number): void;
+
     /**
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFileSync(filename: string, options: { encoding: null; flag?: string; }): Buffer;
-	export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
-	export function readFileSync(filename: string, options: { encoding: string | null; flag?: string; }): string | Buffer;
+    export function lchmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lchmod {
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
     /**
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     * Synchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
-	export function writeFile(filename: string | number, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFile(filename: string | number, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFile(filename: string | number, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFile(filename: string | number, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFileSync(filename: string | number, data: any, encoding: string): void;
-	export function writeFileSync(filename: string | number, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-	export function writeFileSync(filename: string | number, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-	export function appendFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFileSync(filename: string, data: any, encoding: string): void;
-	export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-	export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-	export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
-	export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void;
-	export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void;
-	export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher;
-	export function watch(filename: string, encoding: string, listener?: (event: string, filename: string | Buffer) => any): FSWatcher;
-	export function watch(filename: string, options: { persistent?: boolean; recursive?: boolean; encoding?: string }, listener?: (event: string, filename: string | Buffer) => any): FSWatcher;
-	export function exists(path: string | Buffer, callback?: (exists: boolean) => void): void;
-	export function existsSync(path: string | Buffer): boolean;
+    export function lchmodSync(path: PathLike, mode: string | number): void;
 
-	export namespace constants {
-		// File Access Constants
+    /**
+     * Asynchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function stat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
 
-		/** Constant for fs.access(). File is visible to the calling process. */
-		export const F_OK: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace stat {
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<Stats>;
+    }
 
-		/** Constant for fs.access(). File can be read by the calling process. */
-		export const R_OK: number;
+    /**
+     * Synchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function statSync(path: PathLike): Stats;
 
-		/** Constant for fs.access(). File can be written by the calling process. */
-		export const W_OK: number;
+    /**
+     * Asynchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    export function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
 
-		/** Constant for fs.access(). File can be executed by the calling process. */
-		export const X_OK: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fstat {
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<Stats>;
+    }
 
-		// File Open Constants
+    /**
+     * Synchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    export function fstatSync(fd: number): Stats;
 
-		/** Constant for fs.open(). Flag indicating to open a file for read-only access. */
-		export const O_RDONLY: number;
+    /**
+     * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lstat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
 
-		/** Constant for fs.open(). Flag indicating to open a file for write-only access. */
-		export const O_WRONLY: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lstat {
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<Stats>;
+    }
 
-		/** Constant for fs.open(). Flag indicating to open a file for read-write access. */
-		export const O_RDWR: number;
+    /**
+     * Synchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lstatSync(path: PathLike): Stats;
 
-		/** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
-		export const O_CREAT: number;
+    /**
+     * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function link(existingPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
-		export const O_EXCL: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace link {
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+    }
 
-		/** Constant for fs.open(). Flag indicating that if path identifies a terminal device, opening the path shall not cause that terminal to become the controlling terminal for the process (if the process does not already have one). */
-		export const O_NOCTTY: number;
+    /**
+     * Synchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function linkSync(existingPath: PathLike, newPath: PathLike): void;
 
-		/** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
-		export const O_TRUNC: number;
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    export function symlink(target: PathLike, path: PathLike, type: string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
-		export const O_APPEND: number;
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function symlink(target: PathLike, path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
-		export const O_DIRECTORY: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace symlink {
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        export function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+    }
 
-		/** Constant for fs.open(). Flag indicating reading accesses to the file system will no longer result in an update to the atime information associated with the file. This flag is available on Linux operating systems only. */
-		export const O_NOATIME: number;
+    /**
+     * Synchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    export function symlinkSync(target: PathLike, path: PathLike, type?: string | null): void;
 
-		/** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
-		export const O_NOFOLLOW: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
 
-		/** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
-		export const O_SYNC: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, linkString: Buffer) => void): void;
 
-		/** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
-		export const O_SYMLINK: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string | Buffer) => void): void;
 
-		/** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
-		export const O_DIRECT: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function readlink(path: PathLike, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
 
-		/** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
-		export const O_NONBLOCK: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readlink {
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
 
-		// File Type Constants
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
 
-		/** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
-		export const S_IFMT: number;
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
-		export const S_IFREG: number;
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
-		export const S_IFDIR: number;
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
-		export const S_IFCHR: number;
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
-		export const S_IFBLK: number;
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
-		export const S_IFIFO: number;
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
-		export const S_IFLNK: number;
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
-		export const S_IFSOCK: number;
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function realpath(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
 
-		// File Mode Constants
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace realpath {
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
-		export const S_IRWXU: number;
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
-		export const S_IRUSR: number;
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
-		export const S_IWUSR: number;
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
-		export const S_IXUSR: number;
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
-		export const S_IRWXG: number;
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
-		export const S_IRGRP: number;
+    /**
+     * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function unlink(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
-		export const S_IWGRP: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace unlink {
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<void>;
+    }
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
-		export const S_IXGRP: number;
+    /**
+     * Synchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function unlinkSync(path: PathLike): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
-		export const S_IRWXO: number;
+    /**
+     * Asynchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function rmdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
-		export const S_IROTH: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace rmdir {
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<void>;
+    }
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
-		export const S_IWOTH: number;
+    /**
+     * Synchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function rmdirSync(path: PathLike): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
-		export const S_IXOTH: number;
-	}
+    /**
+     * Asynchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    export function mkdir(path: PathLike, mode: number | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
 
-	/** Tests a user's permissions for the file specified by path. */
-	export function access(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
-	export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
-	/** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
-	export function accessSync(path: string | Buffer, mode?: number): void;
-	export function createReadStream(path: string | Buffer, options?: {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		autoClose?: boolean;
-		start?: number;
-		end?: number;
-	}): ReadStream;
-	export function createWriteStream(path: string | Buffer, options?: {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		autoClose?: boolean;
-		start?: number;
-	}): WriteStream;
-	export function fdatasync(fd: number, callback: Function): void;
-	export function fdatasyncSync(fd: number): void;
+    /**
+     * Asynchronous mkdir(2) - create a directory with a mode of `0o777`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function mkdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace mkdir {
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        export function __promisify__(path: PathLike, mode?: number | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    export function mkdirSync(path: PathLike, mode?: number | string | null): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: "buffer" | { encoding: "buffer" }, callback: (err: NodeJS.ErrnoException, folder: Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     */
+    export function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace mkdtemp {
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, files: Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function readdir(path: PathLike, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readdir {
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: "buffer" | { encoding: "buffer" }): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
+    }
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options?: { encoding: BufferEncoding | null } | BufferEncoding | null): string[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options?: { encoding?: string | null } | string | null): string[] | Buffer[];
+
+    /**
+     * Asynchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace close {
+        /**
+         * Asynchronous close(2) - close a file descriptor.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function closeSync(fd: number): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    export function open(path: PathLike, flags: string | number, mode: string | number | undefined | null, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file. If the file is created, its mode will be `0o666`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function open(path: PathLike, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace open {
+        /**
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+         */
+        export function __promisify__(path: PathLike, flags: string | number, mode?: string | number | null): Promise<number>;
+    }
+
+    /**
+     * Synchronous open(2) - open and possibly create a file, returning a file descriptor..
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    export function openSync(path: PathLike, flags: string | number, mode?: string | number | null): number;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace utimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        export function __promisify__(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function utimesSync(path: PathLike, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function futimes(fd: number, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace futimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        export function __promisify__(fd: number, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function futimesSync(fd: number, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    export function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fsync {
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    export function fsyncSync(fd: number): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, length: number | undefined | null, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, length: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    export function write(fd: number, string: any, position: number | undefined | null, encoding: string | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function write(fd: number, string: any, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     */
+    export function write(fd: number, string: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace write {
+        /**
+         * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         */
+        export function __promisify__<TBuffer extends Buffer | Uint8Array>(fd: number, buffer?: TBuffer, offset?: number, length?: number, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         * @param encoding The expected string encoding.
+         */
+        export function __promisify__(fd: number, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+    }
+
+    /**
+     * Synchronously writes `buffer` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function writeSync(fd: number, buffer: Buffer | Uint8Array, offset?: number | null, length?: number | null, position?: number | null): number;
+
+    /**
+     * Synchronously writes `string` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    export function writeSync(fd: number, string: any, position?: number | null, encoding?: string | null): number;
+
+    /**
+     * Asynchronously reads data from the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    export function read<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: TBuffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace read {
+        /**
+         * @param fd A file descriptor.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The offset in the buffer at which to start writing.
+         * @param length The number of bytes to read.
+         * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+         */
+        export function __promisify__<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+    }
+
+    /**
+     * Synchronously reads data from the file referenced by the supplied file descriptor, returning the number of bytes read.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    export function readSync(fd: number, buffer: Buffer | Uint8Array, offset: number, length: number, position: number | null): number;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding?: null; flag?: string; } | undefined | null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding: string; flag?: string; } | string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding?: string | null; flag?: string; } | string | undefined | null, callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     */
+    export function readFile(path: PathLike | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readFile {
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options: { encoding: string; flag?: string; } | string): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag. If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Buffer;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options: { encoding: string; flag?: string; } | string): string;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): string | Buffer;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    export function writeFile(path: PathLike | number, data: any, options: { encoding?: string | null; mode?: number | string; flag?: string; } | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    export function writeFile(path: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace writeFile {
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'w'` is used.
+         */
+        export function __promisify__(path: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    export function writeFileSync(path: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    export function appendFile(file: PathLike | number, data: any, options: { encoding?: string | null, mode?: string | number, flag?: string } | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    export function appendFile(file: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace appendFile {
+        /**
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
+         */
+        export function __promisify__(file: PathLike | number, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string } | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    export function appendFileSync(file: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     */
+    export function watchFile(filename: PathLike, options: { persistent?: boolean; interval?: number; } | undefined, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function watchFile(filename: PathLike, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Stop watching for changes on `filename`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function unwatchFile(filename: PathLike, listener?: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding?: BufferEncoding | null, persistent?: boolean, recursive?: boolean } | BufferEncoding | undefined | null, listener?: (event: string, filename: string) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding: "buffer", persistent?: boolean, recursive?: boolean } | "buffer", listener?: (event: string, filename: Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding?: string | null, persistent?: boolean, recursive?: boolean } | string | null, listener?: (event: string, filename: string | Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function watch(filename: PathLike, listener?: (event: string, filename: string) => any): FSWatcher;
+
+    /**
+     * Asynchronously tests whether or not the given path exists by checking with the file system.
+     * @deprecated
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function exists(path: PathLike, callback: (exists: boolean) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace exists {
+        /**
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(path: PathLike): Promise<boolean>;
+    }
+
+    /**
+     * Synchronously tests whether or not the given path exists by checking with the file system.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function existsSync(path: PathLike): boolean;
+
+    export namespace constants {
+        // File Access Constants
+
+        /** Constant for fs.access(). File is visible to the calling process. */
+        export const F_OK: number;
+
+        /** Constant for fs.access(). File can be read by the calling process. */
+        export const R_OK: number;
+
+        /** Constant for fs.access(). File can be written by the calling process. */
+        export const W_OK: number;
+
+        /** Constant for fs.access(). File can be executed by the calling process. */
+        export const X_OK: number;
+
+        // File Open Constants
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
+        export const O_RDONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for write-only access. */
+        export const O_WRONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-write access. */
+        export const O_RDWR: number;
+
+        /** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
+        export const O_CREAT: number;
+
+        /** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
+        export const O_EXCL: number;
+
+        /** Constant for fs.open(). Flag indicating that if path identifies a terminal device, opening the path shall not cause that terminal to become the controlling terminal for the process (if the process does not already have one). */
+        export const O_NOCTTY: number;
+
+        /** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
+        export const O_TRUNC: number;
+
+        /** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
+        export const O_APPEND: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
+        export const O_DIRECTORY: number;
+
+        /** Constant for fs.open(). Flag indicating reading accesses to the file system will no longer result in an update to the atime information associated with the file. This flag is available on Linux operating systems only. */
+        export const O_NOATIME: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
+        export const O_NOFOLLOW: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
+        export const O_SYNC: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O with write operations waiting for data integrity. */
+        export const O_DSYNC: number;
+
+        /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
+        export const O_SYMLINK: number;
+
+        /** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
+        export const O_DIRECT: number;
+
+        /** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
+        export const O_NONBLOCK: number;
+
+        // File Type Constants
+
+        /** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
+        export const S_IFMT: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
+        export const S_IFREG: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
+        export const S_IFDIR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
+        export const S_IFCHR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
+        export const S_IFBLK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
+        export const S_IFIFO: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
+        export const S_IFLNK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
+        export const S_IFSOCK: number;
+
+        // File Mode Constants
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
+        export const S_IRWXU: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
+        export const S_IRUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
+        export const S_IWUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
+        export const S_IXUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
+        export const S_IRWXG: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
+        export const S_IRGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
+        export const S_IWGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
+        export const S_IXGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
+        export const S_IRWXO: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
+        export const S_IROTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
+        export const S_IWOTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
+        export const S_IXOTH: number;
+
+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
+        export const COPYFILE_EXCL: number;
+    }
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function access(path: PathLike, mode: number | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function access(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace access {
+        /**
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        export function __promisify__(path: PathLike, mode?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function accessSync(path: PathLike, mode?: number): void;
+
+    /**
+     * Returns a new `ReadStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function createReadStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+        end?: number;
+        highWaterMark?: number;
+    }): ReadStream;
+
+    /**
+     * Returns a new `WriteStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function createWriteStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+    }): WriteStream;
+
+    /**
+     * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    export function fdatasync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fdatasync {
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    export function fdatasyncSync(fd: number): void;
+
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, flags: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace copyFile {
+        /**
+         * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+         * No arguments other than a possible exception are given to the callback function.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+         */
+        export function __promisify__(src: PathLike, dst: PathLike, flags?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
 }
 
 declare module "path" {
-
     /**
      * A parsed path object generated by path.parse() or consumed by path.format().
      */
-	export interface ParsedPath {
+    export interface ParsedPath {
         /**
          * The root of the path such as '/' or 'c:\'
          */
-		root: string;
+        root: string;
         /**
          * The full directory path such as '/home/user/dir' or 'c:\path\dir'
          */
-		dir: string;
+        dir: string;
         /**
          * The file name including extension (if any) such as 'index.html'
          */
-		base: string;
+        base: string;
         /**
          * The file extension (if any) such as '.html'
          */
-		ext: string;
+        ext: string;
         /**
          * The file name without extension (if any) such as 'index'
          */
-		name: string;
-	}
+        name: string;
+    }
+    export interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
 
     /**
      * Normalize a string path, reducing '..' and '.' parts.
@@ -2925,14 +4600,14 @@ declare module "path" {
      *
      * @param p string path to normalize.
      */
-	export function normalize(p: string): string;
+    export function normalize(p: string): string;
     /**
      * Join all arguments together and normalize the resulting path.
      * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
      *
      * @param paths paths to join.
      */
-	export function join(...paths: string[]): string;
+    export function join(...paths: string[]): string;
     /**
      * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
      *
@@ -2942,27 +4617,24 @@ declare module "path" {
      *
      * @param pathSegments string paths to join.  Non-string arguments are ignored.
      */
-	export function resolve(...pathSegments: any[]): string;
+    export function resolve(...pathSegments: string[]): string;
     /**
      * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
      *
      * @param path path to test.
      */
-	export function isAbsolute(path: string): boolean;
+    export function isAbsolute(path: string): boolean;
     /**
      * Solve the relative path from {from} to {to}.
      * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     *
-     * @param from
-     * @param to
      */
-	export function relative(from: string, to: string): string;
+    export function relative(from: string, to: string): string;
     /**
      * Return the directory name of a path. Similar to the Unix dirname command.
      *
      * @param p the path to evaluate.
      */
-	export function dirname(p: string): string;
+    export function dirname(p: string): string;
     /**
      * Return the last portion of a path. Similar to the Unix basename command.
      * Often used to extract the file name from a fully qualified path.
@@ -2970,176 +4642,177 @@ declare module "path" {
      * @param p the path to evaluate.
      * @param ext optionally, an extension to remove from the result.
      */
-	export function basename(p: string, ext?: string): string;
+    export function basename(p: string, ext?: string): string;
     /**
      * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
      * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
      *
      * @param p the path to evaluate.
      */
-	export function extname(p: string): string;
+    export function extname(p: string): string;
     /**
      * The platform-specific file separator. '\\' or '/'.
      */
-	export var sep: string;
+    export var sep: string;
     /**
      * The platform-specific file delimiter. ';' or ':'.
      */
-	export var delimiter: string;
+    export var delimiter: string;
     /**
      * Returns an object from a path string - the opposite of format().
      *
      * @param pathString path to evaluate.
      */
-	export function parse(pathString: string): ParsedPath;
+    export function parse(pathString: string): ParsedPath;
     /**
      * Returns a path string from an object - the opposite of parse().
      *
      * @param pathString path to evaluate.
      */
-	export function format(pathObject: ParsedPath): string;
+    export function format(pathObject: FormatInputPathObject): string;
 
-	export module posix {
-		export function normalize(p: string): string;
-		export function join(...paths: any[]): string;
-		export function resolve(...pathSegments: any[]): string;
-		export function isAbsolute(p: string): boolean;
-		export function relative(from: string, to: string): string;
-		export function dirname(p: string): string;
-		export function basename(p: string, ext?: string): string;
-		export function extname(p: string): string;
-		export var sep: string;
-		export var delimiter: string;
-		export function parse(p: string): ParsedPath;
-		export function format(pP: ParsedPath): string;
-	}
+    export module posix {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: FormatInputPathObject): string;
+    }
 
-	export module win32 {
-		export function normalize(p: string): string;
-		export function join(...paths: any[]): string;
-		export function resolve(...pathSegments: any[]): string;
-		export function isAbsolute(p: string): boolean;
-		export function relative(from: string, to: string): string;
-		export function dirname(p: string): string;
-		export function basename(p: string, ext?: string): string;
-		export function extname(p: string): string;
-		export var sep: string;
-		export var delimiter: string;
-		export function parse(p: string): ParsedPath;
-		export function format(pP: ParsedPath): string;
-	}
+    export module win32 {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: FormatInputPathObject): string;
+    }
 }
 
 declare module "string_decoder" {
-	export interface NodeStringDecoder {
-		write(buffer: Buffer): string;
-		end(buffer?: Buffer): string;
-	}
-	export var StringDecoder: {
-		new(encoding?: string): NodeStringDecoder;
-	};
+    export interface NodeStringDecoder {
+        write(buffer: Buffer): string;
+        end(buffer?: Buffer): string;
+    }
+    export var StringDecoder: {
+        new(encoding?: string): NodeStringDecoder;
+    };
 }
 
 declare module "tls" {
-	import * as crypto from "crypto";
-	import * as net from "net";
-	import * as stream from "stream";
+    import * as crypto from "crypto";
+    import * as dns from "dns";
+    import * as net from "net";
+    import * as stream from "stream";
 
-	var CLIENT_RENEG_LIMIT: number;
-	var CLIENT_RENEG_WINDOW: number;
+    var CLIENT_RENEG_LIMIT: number;
+    var CLIENT_RENEG_WINDOW: number;
 
-	export interface Certificate {
+    export interface Certificate {
         /**
          * Country code.
          */
-		C: string;
+        C: string;
         /**
          * Street.
          */
-		ST: string;
+        ST: string;
         /**
          * Locality.
          */
-		L: string;
+        L: string;
         /**
          * Organization.
          */
-		O: string;
+        O: string;
         /**
          * Organizational unit.
          */
-		OU: string;
+        OU: string;
         /**
          * Common name.
          */
-		CN: string;
-	}
+        CN: string;
+    }
 
-	export interface PeerCertificate {
-		subject: Certificate;
-		issuer: Certificate;
-		subjectaltname: string;
-		infoAccess: { [index: string]: string[] };
-		modulus: string;
-		exponent: string;
-		valid_from: string;
-		valid_to: string;
-		fingerprint: string;
-		ext_key_usage: string[];
-		serialNumber: string;
-		raw: Buffer;
-	}
+    export interface PeerCertificate {
+        subject: Certificate;
+        issuer: Certificate;
+        subjectaltname: string;
+        infoAccess: { [index: string]: string[] | undefined };
+        modulus: string;
+        exponent: string;
+        valid_from: string;
+        valid_to: string;
+        fingerprint: string;
+        ext_key_usage: string[];
+        serialNumber: string;
+        raw: Buffer;
+    }
 
-	export interface DetailedPeerCertificate extends PeerCertificate {
-		issuerCertificate: DetailedPeerCertificate;
-	}
+    export interface DetailedPeerCertificate extends PeerCertificate {
+        issuerCertificate: DetailedPeerCertificate;
+    }
 
-	export interface CipherNameAndProtocol {
+    export interface CipherNameAndProtocol {
         /**
          * The cipher name.
          */
-		name: string;
+        name: string;
         /**
          * SSL/TLS protocol version.
          */
-		version: string;
-	}
+        version: string;
+    }
 
-	export class TLSSocket extends net.Socket {
+    export class TLSSocket extends net.Socket {
         /**
          * Construct a new tls.TLSSocket object from an existing TCP socket.
          */
-		constructor(socket: net.Socket, options?: {
+        constructor(socket: net.Socket, options?: {
             /**
              * An optional TLS context object from tls.createSecureContext()
              */
-			secureContext?: SecureContext,
+            secureContext?: SecureContext,
             /**
              * If true the TLS socket will be instantiated in server-mode.
              * Defaults to false.
              */
-			isServer?: boolean,
+            isServer?: boolean,
             /**
              * An optional net.Server instance.
              */
-			server?: net.Server,
+            server?: net.Server,
             /**
              * If true the server will request a certificate from clients that
              * connect and attempt to verify that certificate. Defaults to
              * false.
              */
-			requestCert?: boolean,
+            requestCert?: boolean,
             /**
              * If true the server will reject any connection which is not
              * authorized with the list of supplied CAs. This option only has an
              * effect if requestCert is true. Defaults to false.
              */
-			rejectUnauthorized?: boolean,
+            rejectUnauthorized?: boolean,
             /**
              * An array of strings or a Buffer naming possible NPN protocols.
              * (Protocols should be ordered by their priority.)
              */
-			NPNProtocols?: string[] | Buffer,
+            NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * An array of strings or a Buffer naming possible ALPN protocols.
              * (Protocols should be ordered by their priority.) When the server
@@ -3147,7 +4820,7 @@ declare module "tls" {
              * precedence over NPN and the server does not send an NPN extension
              * to the client.
              */
-			ALPNProtocols?: string[] | Buffer,
+            ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * SNICallback(servername, cb) <Function> A function that will be
              * called if the client supports SNI TLS extension. Two arguments
@@ -3157,99 +4830,73 @@ declare module "tls" {
              * SecureContext.) If SNICallback wasn't provided the default callback
              * with high-level API will be used (see below).
              */
-			SNICallback?: Function,
+            SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void,
             /**
              * An optional Buffer instance containing a TLS session.
              */
-			session?: Buffer,
+            session?: Buffer,
             /**
              * If true, specifies that the OCSP status request extension will be
              * added to the client hello and an 'OCSPResponse' event will be
              * emitted on the socket before establishing a secure communication
              */
-			requestOCSP?: boolean
-		});
-        /**
-         * Returns the bound address, the address family name and port of the underlying socket as reported by
-         * the operating system.
-         * @returns {any} - An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
-         */
-		address(): { port: number; family: string; address: string };
+            requestOCSP?: boolean
+        });
+
         /**
          * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
          */
-		authorized: boolean;
+        authorized: boolean;
         /**
          * The reason why the peer's certificate has not been verified.
          * This property becomes available only when tlsSocket.authorized === false.
          */
-		authorizationError: Error;
+        authorizationError: Error;
         /**
          * Static boolean value, always true.
          * May be used to distinguish TLS sockets from regular ones.
          */
-		encrypted: boolean;
+        encrypted: boolean;
         /**
          * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
-         * @returns {CipherNameAndProtocol} - Returns an object representing the cipher name
+         * @returns Returns an object representing the cipher name
          * and the SSL/TLS protocol version of the current connection.
          */
-		getCipher(): CipherNameAndProtocol;
+        getCipher(): CipherNameAndProtocol;
         /**
          * Returns an object representing the peer's certificate.
          * The returned object has some properties corresponding to the field of the certificate.
          * If detailed argument is true the full chain with issuer property will be returned,
          * if false only the top certificate without issuer property.
          * If the peer does not provide a certificate, it returns null or an empty object.
-         * @param {boolean} detailed - If true; the full chain with issuer property will be returned.
-         * @returns {PeerCertificate | DetailedPeerCertificate} - An object representing the peer's certificate.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
          */
-		getPeerCertificate(detailed: true): DetailedPeerCertificate;
-		getPeerCertificate(detailed?: false): PeerCertificate;
-		getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        getPeerCertificate(detailed: true): DetailedPeerCertificate;
+        getPeerCertificate(detailed?: false): PeerCertificate;
+        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
-         * @returns {any} - ASN.1 encoded TLS session or undefined if none was negotiated.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
          */
-		getSession(): any;
+        getSession(): any;
         /**
          * NOTE: Works only with client TLS sockets.
          * Useful only for debugging, for session reuse provide session option to tls.connect().
-         * @returns {any} - TLS session ticket or undefined if none was negotiated.
+         * @returns TLS session ticket or undefined if none was negotiated.
          */
-		getTLSTicket(): any;
-        /**
-         * The string representation of the local IP address.
-         */
-		localAddress: string;
-        /**
-         * The numeric representation of the local port.
-         */
-		localPort: number;
-        /**
-         * The string representation of the remote IP address.
-         * For example, '74.125.127.100' or '2001:4860:a005::68'.
-         */
-		remoteAddress: string;
-        /**
-         * The string representation of the remote IP family. 'IPv4' or 'IPv6'.
-         */
-		remoteFamily: string;
-        /**
-         * The numeric representation of the remote port. For example, 443.
-         */
-		remotePort: number;
+        getTLSTicket(): any;
         /**
          * Initiate TLS renegotiation process.
          *
          * NOTE: Can be used to request peer's certificate after the secure connection has been established.
          * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
-         * @param {TlsOptions} options - The options may contain the following fields: rejectUnauthorized,
+         * @param options - The options may contain the following fields: rejectUnauthorized,
          * requestCert (See tls.createServer() for details).
-         * @param {Function} callback - callback(err) will be executed with null as err, once the renegotiation
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
          */
-		renegotiate(options: TlsOptions, callback: (err: Error) => any): any;
+        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
         /**
          * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
          * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
@@ -3257,97 +4904,74 @@ declare module "tls" {
          * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
          * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
          * which may decrease overall server throughput.
-         * @param {number} size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
-         * @returns {boolean} - Returns true on success, false otherwise.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
          */
-		setMaxSendFragment(size: number): boolean;
+        setMaxSendFragment(size: number): boolean;
 
         /**
          * events.EventEmitter
          * 1. OCSPResponse
          * 2. secureConnect
-         **/
-		addListener(event: string, listener: Function): this;
-		addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		addListener(event: "secureConnect", listener: () => void): this;
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        addListener(event: "secureConnect", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "OCSPResponse", response: Buffer): boolean;
-		emit(event: "secureConnect"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "OCSPResponse", response: Buffer): boolean;
+        emit(event: "secureConnect"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		on(event: "secureConnect", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        on(event: "secureConnect", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		once(event: "secureConnect", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        once(event: "secureConnect", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		prependListener(event: "secureConnect", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependListener(event: "secureConnect", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		prependOnceListener(event: "secureConnect", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependOnceListener(event: "secureConnect", listener: () => void): this;
+    }
 
-	export interface TlsOptions {
-		host?: string;
-		port?: number;
-		pfx?: string | Buffer[];
-		key?: string | string[] | Buffer | any[];
-		passphrase?: string;
-		cert?: string | string[] | Buffer | Buffer[];
-		ca?: string | string[] | Buffer | Buffer[];
-		crl?: string | string[];
-		ciphers?: string;
-		honorCipherOrder?: boolean;
-		requestCert?: boolean;
-		rejectUnauthorized?: boolean;
-		NPNProtocols?: string[] | Buffer;
-		SNICallback?: (servername: string, cb: (err: Error, ctx: SecureContext) => any) => any;
-		ecdhCurve?: string;
-		dhparam?: string | Buffer;
-		handshakeTimeout?: number;
-		ALPNProtocols?: string[] | Buffer;
-		sessionTimeout?: number;
-		ticketKeys?: any;
-		sessionIdContext?: string;
-		secureProtocol?: string;
-	}
+    export interface TlsOptions extends SecureContextOptions {
+        handshakeTimeout?: number;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
+        sessionTimeout?: number;
+        ticketKeys?: Buffer;
+    }
 
-	export interface ConnectionOptions {
-		host?: string;
-		port?: number;
-		socket?: net.Socket;
-		pfx?: string | Buffer
-		key?: string | string[] | Buffer | Buffer[];
-		passphrase?: string;
-		cert?: string | string[] | Buffer | Buffer[];
-		ca?: string | Buffer | (string | Buffer)[];
-		rejectUnauthorized?: boolean;
-		NPNProtocols?: (string | Buffer)[];
-		servername?: string;
-		path?: string;
-		ALPNProtocols?: (string | Buffer)[];
-		checkServerIdentity?: (servername: string, cert: string | Buffer | (string | Buffer)[]) => any;
-		secureProtocol?: string;
-		secureContext?: Object;
-		session?: Buffer;
-		minDHSize?: number;
-	}
+    export interface ConnectionOptions extends SecureContextOptions {
+        host?: string;
+        port?: number;
+        path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
+        socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
+        rejectUnauthorized?: boolean; // Defaults to true
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        checkServerIdentity?: typeof checkServerIdentity;
+        servername?: string; // SNI TLS Extension
+        session?: Buffer;
+        minDHSize?: number;
+        secureContext?: SecureContext; // If not provided, the entire ConnectionOptions object will be passed to tls.createSecureContext()
+        lookup?: net.LookupFunction;
+    }
 
-	export interface Server extends net.Server {
-		close(callback?: Function): Server;
-		address(): { port: number; family: string; address: string; };
-		addContext(hostName: string, credentials: {
-			key: string;
-			cert: string;
-			ca: string;
-		}): void;
-		maxConnections: number;
-		connections: number;
+    export class Server extends net.Server {
+        addContext(hostName: string, credentials: {
+            key: string;
+            cert: string;
+            ca: string;
+        }): void;
 
         /**
          * events.EventEmitter
@@ -3356,1022 +4980,2162 @@ declare module "tls" {
          * 3. OCSPRequest
          * 4. resumeSession
          * 5. secureConnection
-         **/
-		addListener(event: string, listener: Function): this;
-		addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
-		emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
-		emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
-		emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
-		emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
+        emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
+        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
+        emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
+        emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+    }
 
-	export interface ClearTextStream extends stream.Duplex {
-		authorized: boolean;
-		authorizationError: Error;
-		getPeerCertificate(): any;
-		getCipher: {
-			name: string;
-			version: string;
-		};
-		address: {
-			port: number;
-			family: string;
-			address: string;
-		};
-		remoteAddress: string;
-		remotePort: number;
-	}
+    export interface ClearTextStream extends stream.Duplex {
+        authorized: boolean;
+        authorizationError: Error;
+        getPeerCertificate(): any;
+        getCipher: {
+            name: string;
+            version: string;
+        };
+        address: {
+            port: number;
+            family: string;
+            address: string;
+        };
+        remoteAddress: string;
+        remotePort: number;
+    }
 
-	export interface SecurePair {
-		encrypted: any;
-		cleartext: any;
-	}
+    export interface SecurePair {
+        encrypted: any;
+        cleartext: any;
+    }
 
-	export interface SecureContextOptions {
-		pfx?: string | Buffer;
-		key?: string | Buffer;
-		passphrase?: string;
-		cert?: string | Buffer;
-		ca?: string | Buffer;
-		crl?: string | string[]
-		ciphers?: string;
-		honorCipherOrder?: boolean;
-	}
+    export interface SecureContextOptions {
+        pfx?: string | Buffer | Array<string | Buffer | Object>;
+        key?: string | Buffer | Array<Buffer | Object>;
+        passphrase?: string;
+        cert?: string | Buffer | Array<string | Buffer>;
+        ca?: string | Buffer | Array<string | Buffer>;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        ecdhCurve?: string;
+        crl?: string | Buffer | Array<string | Buffer>;
+        dhparam?: string | Buffer;
+        secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
+        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
+        sessionIdContext?: string;
+    }
 
-	export interface SecureContext {
-		context: any;
-	}
+    export interface SecureContext {
+        context: any;
+    }
 
-	export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
-	export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
-	export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
-	export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
-	export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
-	export function createSecureContext(details: SecureContextOptions): SecureContext;
+    /*
+     * Verifies the certificate `cert` is issued to host `host`.
+     * @host The hostname to verify the certificate against
+     * @cert PeerCertificate representing the peer's certificate
+     *
+     * Returns Error object, populating it with the reason, host and cert on failure.  On success, returns undefined.
+     */
+    export function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
+    export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
+    export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
+    export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
+    export function createSecureContext(details: SecureContextOptions): SecureContext;
+    export function getCiphers(): string[];
+
+    export var DEFAULT_ECDH_CURVE: string;
 }
 
 declare module "crypto" {
-	export interface Certificate {
-		exportChallenge(spkac: string | Buffer): Buffer;
-		exportPublicKey(spkac: string | Buffer): Buffer;
-		verifySpkac(spkac: Buffer): boolean;
-	}
-	export var Certificate: {
-		new(): Certificate;
-		(): Certificate;
-	}
+    export interface Certificate {
+        exportChallenge(spkac: string | Buffer): Buffer;
+        exportPublicKey(spkac: string | Buffer): Buffer;
+        verifySpkac(spkac: Buffer): boolean;
+    }
+    export var Certificate: {
+        new(): Certificate;
+        (): Certificate;
+    };
 
-	export var fips: boolean;
+    export var fips: boolean;
 
-	export interface CredentialDetails {
-		pfx: string;
-		key: string;
-		passphrase: string;
-		cert: string;
-		ca: string | string[];
-		crl: string | string[];
-		ciphers: string;
-	}
-	export interface Credentials { context?: any; }
-	export function createCredentials(details: CredentialDetails): Credentials;
-	export function createHash(algorithm: string): Hash;
-	export function createHmac(algorithm: string, key: string | Buffer): Hmac;
+    export interface CredentialDetails {
+        pfx: string;
+        key: string;
+        passphrase: string;
+        cert: string;
+        ca: string | string[];
+        crl: string | string[];
+        ciphers: string;
+    }
+    export interface Credentials { context?: any; }
+    export function createCredentials(details: CredentialDetails): Credentials;
+    export function createHash(algorithm: string): Hash;
+    export function createHmac(algorithm: string, key: string | Buffer): Hmac;
 
-	type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
-	type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
-	type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
-	type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
-	type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
+    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
+    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
+    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
+    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
+    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
 
-	export interface Hash extends NodeJS.ReadWriteStream {
-		update(data: string | Buffer): Hash;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hash;
-		digest(): Buffer;
-		digest(encoding: HexBase64Latin1Encoding): string;
-	}
-	export interface Hmac extends NodeJS.ReadWriteStream {
-		update(data: string | Buffer): Hmac;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
-		digest(): Buffer;
-		digest(encoding: HexBase64Latin1Encoding): string;
-	}
-	export function createCipher(algorithm: string, password: any): Cipher;
-	export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
-	export interface Cipher extends NodeJS.ReadWriteStream {
-		update(data: Buffer): Buffer;
-		update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
-		update(data: Buffer, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
-		update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
-		final(): Buffer;
-		final(output_encoding: string): string;
-		setAutoPadding(auto_padding?: boolean): void;
-		getAuthTag(): Buffer;
-		setAAD(buffer: Buffer): void;
-	}
-	export function createDecipher(algorithm: string, password: any): Decipher;
-	export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
-	export interface Decipher extends NodeJS.ReadWriteStream {
-		update(data: Buffer): Buffer;
-		update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
-		update(data: Buffer, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
-		update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
-		final(): Buffer;
-		final(output_encoding: string): string;
-		setAutoPadding(auto_padding?: boolean): void;
-		setAuthTag(tag: Buffer): void;
-		setAAD(buffer: Buffer): void;
-	}
-	export function createSign(algorithm: string): Signer;
-	export interface Signer extends NodeJS.WritableStream {
-		update(data: string | Buffer): Signer;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Signer;
-		sign(private_key: string | { key: string; passphrase: string }): Buffer;
-		sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
-	}
-	export function createVerify(algorith: string): Verify;
-	export interface Verify extends NodeJS.WritableStream {
-		update(data: string | Buffer): Verify;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Verify;
-		verify(object: string, signature: Buffer): boolean;
-		verify(object: string, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
-	}
-	export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
-	export function createDiffieHellman(prime: Buffer): DiffieHellman;
-	export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
-	export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
-	export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
-	export interface DiffieHellman {
-		generateKeys(): Buffer;
-		generateKeys(encoding: HexBase64Latin1Encoding): string;
-		computeSecret(other_public_key: Buffer): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
-		getPrime(): Buffer;
-		getPrime(encoding: HexBase64Latin1Encoding): string;
-		getGenerator(): Buffer;
-		getGenerator(encoding: HexBase64Latin1Encoding): string;
-		getPublicKey(): Buffer;
-		getPublicKey(encoding: HexBase64Latin1Encoding): string;
-		getPrivateKey(): Buffer;
-		getPrivateKey(encoding: HexBase64Latin1Encoding): string;
-		setPublicKey(public_key: Buffer): void;
-		setPublicKey(public_key: string, encoding: string): void;
-		setPrivateKey(private_key: Buffer): void;
-		setPrivateKey(private_key: string, encoding: string): void;
-		verifyError: number;
-	}
-	export function getDiffieHellman(group_name: string): DiffieHellman;
-	export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
-	export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
-	export function randomBytes(size: number): Buffer;
-	export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function pseudoRandomBytes(size: number): Buffer;
-	export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFillSync(buffer: Buffer | Uint8Array, offset?: number, size?: number): Buffer;
-	export function randomFill(buffer: Buffer, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFill(buffer: Uint8Array, callback: (err: Error, buf: Uint8Array) => void): void;
-	export function randomFill(buffer: Buffer, offset: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFill(buffer: Uint8Array, offset: number, callback: (err: Error, buf: Uint8Array) => void): void;
-	export function randomFill(buffer: Buffer, offset: number, size: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFill(buffer: Uint8Array, offset: number, size: number, callback: (err: Error, buf: Uint8Array) => void): void;
-	export interface RsaPublicKey {
-		key: string;
-		padding?: number;
-	}
-	export interface RsaPrivateKey {
-		key: string;
-		passphrase?: string,
-		padding?: number;
-	}
-	export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
-	export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
-	export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
-	export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
-	export function getCiphers(): string[];
-	export function getCurves(): string[];
-	export function getHashes(): string[];
-	export interface ECDH {
-		generateKeys(): Buffer;
-		generateKeys(encoding: HexBase64Latin1Encoding): string;
-		generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
-		computeSecret(other_public_key: Buffer): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
-		getPrivateKey(): Buffer;
-		getPrivateKey(encoding: HexBase64Latin1Encoding): string;
-		getPublicKey(): Buffer;
-		getPublicKey(encoding: HexBase64Latin1Encoding): string;
-		getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
-		setPrivateKey(private_key: Buffer): void;
-		setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
-	}
-	export function createECDH(curve_name: string): ECDH;
-	export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
-	export var DEFAULT_ENCODING: string;
+    export interface Hash extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | DataView): Hash;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hash;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | DataView): Hmac;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export function createCipher(algorithm: string, password: any): Cipher;
+    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
+    export interface Cipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer | DataView): Buffer;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): void;
+        getAuthTag(): Buffer;
+        setAAD(buffer: Buffer): void;
+    }
+    export function createDecipher(algorithm: string, password: any): Decipher;
+    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
+    export interface Decipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer | DataView): Buffer;
+        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): void;
+        setAuthTag(tag: Buffer): void;
+        setAAD(buffer: Buffer): void;
+    }
+    export function createSign(algorithm: string): Signer;
+    export interface Signer extends NodeJS.WritableStream {
+        update(data: string | Buffer | DataView): Signer;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        sign(private_key: string | { key: string; passphrase: string }): Buffer;
+        sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
+    }
+    export function createVerify(algorith: string): Verify;
+    export interface Verify extends NodeJS.WritableStream {
+        update(data: string | Buffer | DataView): Verify;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        verify(object: string | Object, signature: Buffer | DataView): boolean;
+        verify(object: string | Object, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
+        // https://nodejs.org/api/crypto.html#crypto_verifier_verify_object_signature_signature_format
+        // The signature field accepts a TypedArray type, but it is only available starting ES2017
+    }
+    export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
+    export function createDiffieHellman(prime: Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export interface DiffieHellman {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrime(): Buffer;
+        getPrime(encoding: HexBase64Latin1Encoding): string;
+        getGenerator(): Buffer;
+        getGenerator(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        setPublicKey(public_key: Buffer): void;
+        setPublicKey(public_key: string, encoding: string): void;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: string): void;
+        verifyError: number;
+    }
+    export function getDiffieHellman(group_name: string): DiffieHellman;
+    export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
+    export function randomBytes(size: number): Buffer;
+    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function pseudoRandomBytes(size: number): Buffer;
+    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFillSync(buffer: Buffer | Uint8Array, offset?: number, size?: number): Buffer;
+    export function randomFill(buffer: Buffer, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, size: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export interface RsaPublicKey {
+        key: string;
+        padding?: number;
+    }
+    export interface RsaPrivateKey {
+        key: string;
+        passphrase?: string;
+        padding?: number;
+    }
+    export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
+    export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
+    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
+    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
+    export function getCiphers(): string[];
+    export function getCurves(): string[];
+    export function getHashes(): string[];
+    export interface ECDH {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
+    }
+    export function createECDH(curve_name: string): ECDH;
+    export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
+    export var DEFAULT_ENCODING: string;
 }
 
 declare module "stream" {
-	import * as events from "events";
+    import * as events from "events";
 
-	class internal extends events.EventEmitter {
-		pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-	}
+    class internal extends events.EventEmitter {
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
 
-	namespace internal {
+    namespace internal {
+        export class Stream extends internal { }
 
-		export class Stream extends internal { }
+        export interface ReadableOptions {
+            highWaterMark?: number;
+            encoding?: string;
+            objectMode?: boolean;
+            read?: (this: Readable, size?: number) => any;
+            destroy?: (error?: Error) => any;
+        }
 
-		export interface ReadableOptions {
-			highWaterMark?: number;
-			encoding?: string;
-			objectMode?: boolean;
-			read?: (this: Readable, size?: number) => any;
-		}
-
-		export class Readable extends Stream implements NodeJS.ReadableStream {
-			readable: boolean;
-			constructor(opts?: ReadableOptions);
-			_read(size: number): void;
-			read(size?: number): any;
-			setEncoding(encoding: string): this;
-			pause(): this;
-			resume(): this;
-			isPaused(): boolean;
-			pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-			unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
-			unshift(chunk: any): void;
-			wrap(oldStream: NodeJS.ReadableStream): Readable;
-			push(chunk: any, encoding?: string): boolean;
+        export class Readable extends Stream implements NodeJS.ReadableStream {
+            readable: boolean;
+            constructor(opts?: ReadableOptions);
+            _read(size: number): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
+            isPaused(): boolean;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): this;
+            push(chunk: any, encoding?: string): boolean;
+            _destroy(err: Error, callback: Function): void;
+            destroy(error?: Error): void;
 
             /**
              * Event emitter
              * The defined events on documents including:
-             *   1. close
-             *   2. data
-             *   3. end
-             *   4. readable
-             *   5. error
-             **/
-			addListener(event: string, listener: Function): this;
-			addListener(event: string, listener: Function): this;
-			addListener(event: "close", listener: () => void): this;
-			addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			addListener(event: "end", listener: () => void): this;
-			addListener(event: "readable", listener: () => void): this;
-			addListener(event: "error", listener: (err: Error) => void): this;
+             * 1. close
+             * 2. data
+             * 3. end
+             * 4. readable
+             * 5. error
+             */
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            addListener(event: "end", listener: () => void): this;
+            addListener(event: "readable", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
 
-			emit(event: string | symbol, ...args: any[]): boolean;
-			emit(event: "close"): boolean;
-			emit(event: "data", chunk: Buffer | string): boolean;
-			emit(event: "end"): boolean;
-			emit(event: "readable"): boolean;
-			emit(event: "error", err: Error): boolean;
+            emit(event: string | symbol, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "data", chunk: Buffer | string): boolean;
+            emit(event: "end"): boolean;
+            emit(event: "readable"): boolean;
+            emit(event: "error", err: Error): boolean;
 
-			on(event: string, listener: Function): this;
-			on(event: "close", listener: () => void): this;
-			on(event: "data", listener: (chunk: Buffer | string) => void): this;
-			on(event: "end", listener: () => void): this;
-			on(event: "readable", listener: () => void): this;
-			on(event: "error", listener: (err: Error) => void): this;
+            on(event: string, listener: (...args: any[]) => void): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "data", listener: (chunk: Buffer | string) => void): this;
+            on(event: "end", listener: () => void): this;
+            on(event: "readable", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
 
-			once(event: string, listener: Function): this;
-			once(event: "close", listener: () => void): this;
-			once(event: "data", listener: (chunk: Buffer | string) => void): this;
-			once(event: "end", listener: () => void): this;
-			once(event: "readable", listener: () => void): this;
-			once(event: "error", listener: (err: Error) => void): this;
+            once(event: string, listener: (...args: any[]) => void): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "data", listener: (chunk: Buffer | string) => void): this;
+            once(event: "end", listener: () => void): this;
+            once(event: "readable", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
 
-			prependListener(event: string, listener: Function): this;
-			prependListener(event: "close", listener: () => void): this;
-			prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			prependListener(event: "end", listener: () => void): this;
-			prependListener(event: "readable", listener: () => void): this;
-			prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: string, listener: (...args: any[]) => void): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependListener(event: "end", listener: () => void): this;
+            prependListener(event: "readable", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
 
-			prependOnceListener(event: string, listener: Function): this;
-			prependOnceListener(event: "close", listener: () => void): this;
-			prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			prependOnceListener(event: "end", listener: () => void): this;
-			prependOnceListener(event: "readable", listener: () => void): this;
-			prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependOnceListener(event: "end", listener: () => void): this;
+            prependOnceListener(event: "readable", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
 
-			removeListener(event: string, listener: Function): this;
-			removeListener(event: "close", listener: () => void): this;
-			removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			removeListener(event: "end", listener: () => void): this;
-			removeListener(event: "readable", listener: () => void): this;
-			removeListener(event: "error", listener: (err: Error) => void): this;
-		}
+            removeListener(event: string, listener: (...args: any[]) => void): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            removeListener(event: "end", listener: () => void): this;
+            removeListener(event: "readable", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+        }
 
-		export interface WritableOptions {
-			highWaterMark?: number;
-			decodeStrings?: boolean;
-			objectMode?: boolean;
-			write?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
-			writev?: (chunks: { chunk: string | Buffer, encoding: string }[], callback: Function) => any;
-		}
+        export interface WritableOptions {
+            highWaterMark?: number;
+            decodeStrings?: boolean;
+            objectMode?: boolean;
+            write?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            writev?: (chunks: Array<{ chunk: string | Buffer, encoding: string }>, callback: Function) => any;
+            destroy?: (error?: Error) => any;
+            final?: (callback: (error?: Error) => void) => void;
+        }
 
-		export class Writable extends Stream implements NodeJS.WritableStream {
-			writable: boolean;
-			constructor(opts?: WritableOptions);
-			_write(chunk: any, encoding: string, callback: Function): void;
-			write(chunk: any, cb?: Function): boolean;
-			write(chunk: any, encoding?: string, cb?: Function): boolean;
-			setDefaultEncoding(encoding: string): this;
-			end(): void;
-			end(chunk: any, cb?: Function): void;
-			end(chunk: any, encoding?: string, cb?: Function): void;
+        export class Writable extends Stream implements NodeJS.WritableStream {
+            writable: boolean;
+            constructor(opts?: WritableOptions);
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
+            _destroy(err: Error, callback: Function): void;
+            _final(callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(cb?: Function): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+            cork(): void;
+            uncork(): void;
+            destroy(error?: Error): void;
 
             /**
              * Event emitter
              * The defined events on documents including:
-             *   1. close
-             *   2. drain
-             *   3. error
-             *   4. finish
-             *   5. pipe
-             *   6. unpipe
-             **/
-			addListener(event: string, listener: Function): this;
-			addListener(event: "close", listener: () => void): this;
-			addListener(event: "drain", listener: () => void): this;
-			addListener(event: "error", listener: (err: Error) => void): this;
-			addListener(event: "finish", listener: () => void): this;
-			addListener(event: "pipe", listener: (src: Readable) => void): this;
-			addListener(event: "unpipe", listener: (src: Readable) => void): this;
+             * 1. close
+             * 2. drain
+             * 3. error
+             * 4. finish
+             * 5. pipe
+             * 6. unpipe
+             */
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "drain", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+            addListener(event: "finish", listener: () => void): this;
+            addListener(event: "pipe", listener: (src: Readable) => void): this;
+            addListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-			emit(event: string | symbol, ...args: any[]): boolean;
-			emit(event: "close"): boolean;
-			emit(event: "drain", chunk: Buffer | string): boolean;
-			emit(event: "error", err: Error): boolean;
-			emit(event: "finish"): boolean;
-			emit(event: "pipe", src: Readable): boolean;
-			emit(event: "unpipe", src: Readable): boolean;
+            emit(event: string | symbol, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "drain", chunk: Buffer | string): boolean;
+            emit(event: "error", err: Error): boolean;
+            emit(event: "finish"): boolean;
+            emit(event: "pipe", src: Readable): boolean;
+            emit(event: "unpipe", src: Readable): boolean;
 
-			on(event: string, listener: Function): this;
-			on(event: "close", listener: () => void): this;
-			on(event: "drain", listener: () => void): this;
-			on(event: "error", listener: (err: Error) => void): this;
-			on(event: "finish", listener: () => void): this;
-			on(event: "pipe", listener: (src: Readable) => void): this;
-			on(event: "unpipe", listener: (src: Readable) => void): this;
+            on(event: string, listener: (...args: any[]) => void): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "drain", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+            on(event: "finish", listener: () => void): this;
+            on(event: "pipe", listener: (src: Readable) => void): this;
+            on(event: "unpipe", listener: (src: Readable) => void): this;
 
-			once(event: string, listener: Function): this;
-			once(event: "close", listener: () => void): this;
-			once(event: "drain", listener: () => void): this;
-			once(event: "error", listener: (err: Error) => void): this;
-			once(event: "finish", listener: () => void): this;
-			once(event: "pipe", listener: (src: Readable) => void): this;
-			once(event: "unpipe", listener: (src: Readable) => void): this;
+            once(event: string, listener: (...args: any[]) => void): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "drain", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+            once(event: "finish", listener: () => void): this;
+            once(event: "pipe", listener: (src: Readable) => void): this;
+            once(event: "unpipe", listener: (src: Readable) => void): this;
 
-			prependListener(event: string, listener: Function): this;
-			prependListener(event: "close", listener: () => void): this;
-			prependListener(event: "drain", listener: () => void): this;
-			prependListener(event: "error", listener: (err: Error) => void): this;
-			prependListener(event: "finish", listener: () => void): this;
-			prependListener(event: "pipe", listener: (src: Readable) => void): this;
-			prependListener(event: "unpipe", listener: (src: Readable) => void): this;
+            prependListener(event: string, listener: (...args: any[]) => void): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "drain", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: "finish", listener: () => void): this;
+            prependListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-			prependOnceListener(event: string, listener: Function): this;
-			prependOnceListener(event: "close", listener: () => void): this;
-			prependOnceListener(event: "drain", listener: () => void): this;
-			prependOnceListener(event: "error", listener: (err: Error) => void): this;
-			prependOnceListener(event: "finish", listener: () => void): this;
-			prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
-			prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "drain", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: "finish", listener: () => void): this;
+            prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-			removeListener(event: string, listener: Function): this;
-			removeListener(event: "close", listener: () => void): this;
-			removeListener(event: "drain", listener: () => void): this;
-			removeListener(event: "error", listener: (err: Error) => void): this;
-			removeListener(event: "finish", listener: () => void): this;
-			removeListener(event: "pipe", listener: (src: Readable) => void): this;
-			removeListener(event: "unpipe", listener: (src: Readable) => void): this;
-		}
+            removeListener(event: string, listener: (...args: any[]) => void): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "drain", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+            removeListener(event: "finish", listener: () => void): this;
+            removeListener(event: "pipe", listener: (src: Readable) => void): this;
+            removeListener(event: "unpipe", listener: (src: Readable) => void): this;
+        }
 
-		export interface DuplexOptions extends ReadableOptions, WritableOptions {
-			allowHalfOpen?: boolean;
-			readableObjectMode?: boolean;
-			writableObjectMode?: boolean;
-		}
+        export interface DuplexOptions extends ReadableOptions, WritableOptions {
+            allowHalfOpen?: boolean;
+            readableObjectMode?: boolean;
+            writableObjectMode?: boolean;
+        }
 
-		// Note: Duplex extends both Readable and Writable.
-		export class Duplex extends Readable implements Writable {
-			writable: boolean;
-			constructor(opts?: DuplexOptions);
-			_write(chunk: any, encoding: string, callback: Function): void;
-			write(chunk: any, cb?: Function): boolean;
-			write(chunk: any, encoding?: string, cb?: Function): boolean;
-			setDefaultEncoding(encoding: string): this;
-			end(): void;
-			end(chunk: any, cb?: Function): void;
-			end(chunk: any, encoding?: string, cb?: Function): void;
-		}
+        // Note: Duplex extends both Readable and Writable.
+        export class Duplex extends Readable implements Writable {
+            writable: boolean;
+            constructor(opts?: DuplexOptions);
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
+            _destroy(err: Error, callback: Function): void;
+            _final(callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(cb?: Function): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+            cork(): void;
+            uncork(): void;
+        }
 
-		export interface TransformOptions extends DuplexOptions {
-			transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
-			flush?: (callback: Function) => any;
-		}
+        export interface TransformOptions extends DuplexOptions {
+            transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            flush?: (callback: Function) => any;
+        }
 
-		export class Transform extends Duplex {
-			constructor(opts?: TransformOptions);
-			_transform(chunk: any, encoding: string, callback: Function): void;
-		}
+        export class Transform extends Duplex {
+            constructor(opts?: TransformOptions);
+            _transform(chunk: any, encoding: string, callback: Function): void;
+            destroy(error?: Error): void;
+        }
 
-		export class PassThrough extends Transform { }
-	}
+        export class PassThrough extends Transform { }
+    }
 
-	export = internal;
+    export = internal;
 }
 
 declare module "util" {
-	export interface InspectOptions extends NodeJS.InspectOptions { }
-	export function format(format: any, ...param: any[]): string;
-	export function debug(string: string): void;
-	export function error(...param: any[]): void;
-	export function puts(...param: any[]): void;
-	export function print(...param: any[]): void;
-	export function log(string: string): void;
-	export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
-	export function inspect(object: any, options: InspectOptions): string;
-	export function isArray(object: any): object is any[];
-	export function isRegExp(object: any): object is RegExp;
-	export function isDate(object: any): object is Date;
-	export function isError(object: any): object is Error;
-	export function inherits(constructor: any, superConstructor: any): void;
-	export function debuglog(key: string): (msg: string, ...param: any[]) => void;
-	export function isBoolean(object: any): object is boolean;
-	export function isBuffer(object: any): object is Buffer;
-	export function isFunction(object: any): boolean;
-	export function isNull(object: any): object is null;
-	export function isNullOrUndefined(object: any): object is null | undefined;
-	export function isNumber(object: any): object is number;
-	export function isObject(object: any): boolean;
-	export function isPrimitive(object: any): boolean;
-	export function isString(object: any): object is string;
-	export function isSymbol(object: any): object is symbol;
-	export function isUndefined(object: any): object is undefined;
-	export function deprecate<T extends Function>(fn: T, message: string): T;
+    export interface InspectOptions extends NodeJS.InspectOptions { }
+    export function format(format: any, ...param: any[]): string;
+    export function debug(string: string): void;
+    export function error(...param: any[]): void;
+    export function puts(...param: any[]): void;
+    export function print(...param: any[]): void;
+    export function log(string: string): void;
+    export var inspect: {
+        (object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
+        (object: any, options: InspectOptions): string;
+        colors: {
+            [color: string]: [number, number] | undefined
+        }
+        styles: {
+            [style: string]: string | undefined
+        }
+        defaultOptions: InspectOptions;
+        custom: symbol;
+    };
+    export function isArray(object: any): object is any[];
+    export function isRegExp(object: any): object is RegExp;
+    export function isDate(object: any): object is Date;
+    export function isError(object: any): object is Error;
+    export function inherits(constructor: any, superConstructor: any): void;
+    export function debuglog(key: string): (msg: string, ...param: any[]) => void;
+    export function isBoolean(object: any): object is boolean;
+    export function isBuffer(object: any): object is Buffer;
+    export function isFunction(object: any): boolean;
+    export function isNull(object: any): object is null;
+    export function isNullOrUndefined(object: any): object is null | undefined;
+    export function isNumber(object: any): object is number;
+    export function isObject(object: any): boolean;
+    export function isPrimitive(object: any): boolean;
+    export function isString(object: any): object is string;
+    export function isSymbol(object: any): object is symbol;
+    export function isUndefined(object: any): object is undefined;
+    export function deprecate<T extends Function>(fn: T, message: string): T;
+
+    export interface CustomPromisify<TCustom extends Function> extends Function {
+        __promisify__: TCustom;
+    }
+
+    export function callbackify(fn: () => Promise<void>): (callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<TResult>(fn: () => Promise<TResult>): (callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1>(fn: (arg1: T1) => Promise<void>): (arg1: T1, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, TResult>(fn: (arg1: T1) => Promise<TResult>): (arg1: T1, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, T6>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, T6, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+
+    export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
+    export function promisify<TResult>(fn: (callback: (err: Error, result: TResult) => void) => void): () => Promise<TResult>;
+    export function promisify(fn: (callback: (err: Error) => void) => void): () => Promise<void>;
+    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify(fn: Function): Function;
+    export namespace promisify {
+        const custom: symbol;
+    }
 }
 
 declare module "assert" {
-	function internal(value: any, message?: string): void;
-	namespace internal {
-		export class AssertionError implements Error {
-			name: string;
-			message: string;
-			actual: any;
-			expected: any;
-			operator: string;
-			generatedMessage: boolean;
+    function internal(value: any, message?: string): void;
+    namespace internal {
+        export class AssertionError implements Error {
+            name: string;
+            message: string;
+            actual: any;
+            expected: any;
+            operator: string;
+            generatedMessage: boolean;
 
-			constructor(options?: {
-				message?: string; actual?: any; expected?: any;
-				operator?: string; stackStartFunction?: Function
-			});
-		}
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFunction?: Function
+            });
+        }
 
-		export function fail(actual?: any, expected?: any, message?: string, operator?: string): void;
-		export function ok(value: any, message?: string): void;
-		export function equal(actual: any, expected: any, message?: string): void;
-		export function notEqual(actual: any, expected: any, message?: string): void;
-		export function deepEqual(actual: any, expected: any, message?: string): void;
-		export function notDeepEqual(acutal: any, expected: any, message?: string): void;
-		export function strictEqual(actual: any, expected: any, message?: string): void;
-		export function notStrictEqual(actual: any, expected: any, message?: string): void;
-		export function deepStrictEqual(actual: any, expected: any, message?: string): void;
-		export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
+        export function fail(message: string): void;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): void;
+        export function ok(value: any, message?: string): void;
+        export function equal(actual: any, expected: any, message?: string): void;
+        export function notEqual(actual: any, expected: any, message?: string): void;
+        export function deepEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepEqual(acutal: any, expected: any, message?: string): void;
+        export function strictEqual(actual: any, expected: any, message?: string): void;
+        export function notStrictEqual(actual: any, expected: any, message?: string): void;
+        export function deepStrictEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
 
-		export function throws(block: Function, message?: string): void;
-		export function throws(block: Function, error: Function, message?: string): void;
-		export function throws(block: Function, error: RegExp, message?: string): void;
-		export function throws(block: Function, error: (err: any) => boolean, message?: string): void;
+        export function throws(block: Function, message?: string): void;
+        export function throws(block: Function, error: Function, message?: string): void;
+        export function throws(block: Function, error: RegExp, message?: string): void;
+        export function throws(block: Function, error: (err: any) => boolean, message?: string): void;
 
-		export function doesNotThrow(block: Function, message?: string): void;
-		export function doesNotThrow(block: Function, error: Function, message?: string): void;
-		export function doesNotThrow(block: Function, error: RegExp, message?: string): void;
-		export function doesNotThrow(block: Function, error: (err: any) => boolean, message?: string): void;
+        export function doesNotThrow(block: Function, message?: string): void;
+        export function doesNotThrow(block: Function, error: Function, message?: string): void;
+        export function doesNotThrow(block: Function, error: RegExp, message?: string): void;
+        export function doesNotThrow(block: Function, error: (err: any) => boolean, message?: string): void;
 
-		export function ifError(value: any): void;
-	}
+        export function ifError(value: any): void;
+    }
 
-	export = internal;
+    export = internal;
 }
 
 declare module "tty" {
-	import * as net from "net";
+    import * as net from "net";
 
-	export function isatty(fd: number): boolean;
-	export interface ReadStream extends net.Socket {
-		isRaw: boolean;
-		setRawMode(mode: boolean): void;
-		isTTY: boolean;
-	}
-	export interface WriteStream extends net.Socket {
-		columns: number;
-		rows: number;
-		isTTY: boolean;
-	}
+    export function isatty(fd: number): boolean;
+    export class ReadStream extends net.Socket {
+        isRaw: boolean;
+        setRawMode(mode: boolean): void;
+        isTTY: boolean;
+    }
+    export class WriteStream extends net.Socket {
+        columns: number;
+        rows: number;
+        isTTY: boolean;
+    }
 }
 
 declare module "domain" {
-	import * as events from "events";
+    import * as events from "events";
 
-	export class Domain extends events.EventEmitter implements NodeJS.Domain {
-		run(fn: Function): void;
-		add(emitter: events.EventEmitter): void;
-		remove(emitter: events.EventEmitter): void;
-		bind(cb: (err: Error, data: any) => any): any;
-		intercept(cb: (data: any) => any): any;
-		dispose(): void;
-		members: any[];
-		enter(): void;
-		exit(): void;
-	}
+    export class Domain extends events.EventEmitter implements NodeJS.Domain {
+        run(fn: Function): void;
+        add(emitter: events.EventEmitter): void;
+        remove(emitter: events.EventEmitter): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+        members: any[];
+        enter(): void;
+        exit(): void;
+    }
 
-	export function create(): Domain;
+    export function create(): Domain;
 }
 
 declare module "constants" {
-	export var E2BIG: number;
-	export var EACCES: number;
-	export var EADDRINUSE: number;
-	export var EADDRNOTAVAIL: number;
-	export var EAFNOSUPPORT: number;
-	export var EAGAIN: number;
-	export var EALREADY: number;
-	export var EBADF: number;
-	export var EBADMSG: number;
-	export var EBUSY: number;
-	export var ECANCELED: number;
-	export var ECHILD: number;
-	export var ECONNABORTED: number;
-	export var ECONNREFUSED: number;
-	export var ECONNRESET: number;
-	export var EDEADLK: number;
-	export var EDESTADDRREQ: number;
-	export var EDOM: number;
-	export var EEXIST: number;
-	export var EFAULT: number;
-	export var EFBIG: number;
-	export var EHOSTUNREACH: number;
-	export var EIDRM: number;
-	export var EILSEQ: number;
-	export var EINPROGRESS: number;
-	export var EINTR: number;
-	export var EINVAL: number;
-	export var EIO: number;
-	export var EISCONN: number;
-	export var EISDIR: number;
-	export var ELOOP: number;
-	export var EMFILE: number;
-	export var EMLINK: number;
-	export var EMSGSIZE: number;
-	export var ENAMETOOLONG: number;
-	export var ENETDOWN: number;
-	export var ENETRESET: number;
-	export var ENETUNREACH: number;
-	export var ENFILE: number;
-	export var ENOBUFS: number;
-	export var ENODATA: number;
-	export var ENODEV: number;
-	export var ENOENT: number;
-	export var ENOEXEC: number;
-	export var ENOLCK: number;
-	export var ENOLINK: number;
-	export var ENOMEM: number;
-	export var ENOMSG: number;
-	export var ENOPROTOOPT: number;
-	export var ENOSPC: number;
-	export var ENOSR: number;
-	export var ENOSTR: number;
-	export var ENOSYS: number;
-	export var ENOTCONN: number;
-	export var ENOTDIR: number;
-	export var ENOTEMPTY: number;
-	export var ENOTSOCK: number;
-	export var ENOTSUP: number;
-	export var ENOTTY: number;
-	export var ENXIO: number;
-	export var EOPNOTSUPP: number;
-	export var EOVERFLOW: number;
-	export var EPERM: number;
-	export var EPIPE: number;
-	export var EPROTO: number;
-	export var EPROTONOSUPPORT: number;
-	export var EPROTOTYPE: number;
-	export var ERANGE: number;
-	export var EROFS: number;
-	export var ESPIPE: number;
-	export var ESRCH: number;
-	export var ETIME: number;
-	export var ETIMEDOUT: number;
-	export var ETXTBSY: number;
-	export var EWOULDBLOCK: number;
-	export var EXDEV: number;
-	export var WSAEINTR: number;
-	export var WSAEBADF: number;
-	export var WSAEACCES: number;
-	export var WSAEFAULT: number;
-	export var WSAEINVAL: number;
-	export var WSAEMFILE: number;
-	export var WSAEWOULDBLOCK: number;
-	export var WSAEINPROGRESS: number;
-	export var WSAEALREADY: number;
-	export var WSAENOTSOCK: number;
-	export var WSAEDESTADDRREQ: number;
-	export var WSAEMSGSIZE: number;
-	export var WSAEPROTOTYPE: number;
-	export var WSAENOPROTOOPT: number;
-	export var WSAEPROTONOSUPPORT: number;
-	export var WSAESOCKTNOSUPPORT: number;
-	export var WSAEOPNOTSUPP: number;
-	export var WSAEPFNOSUPPORT: number;
-	export var WSAEAFNOSUPPORT: number;
-	export var WSAEADDRINUSE: number;
-	export var WSAEADDRNOTAVAIL: number;
-	export var WSAENETDOWN: number;
-	export var WSAENETUNREACH: number;
-	export var WSAENETRESET: number;
-	export var WSAECONNABORTED: number;
-	export var WSAECONNRESET: number;
-	export var WSAENOBUFS: number;
-	export var WSAEISCONN: number;
-	export var WSAENOTCONN: number;
-	export var WSAESHUTDOWN: number;
-	export var WSAETOOMANYREFS: number;
-	export var WSAETIMEDOUT: number;
-	export var WSAECONNREFUSED: number;
-	export var WSAELOOP: number;
-	export var WSAENAMETOOLONG: number;
-	export var WSAEHOSTDOWN: number;
-	export var WSAEHOSTUNREACH: number;
-	export var WSAENOTEMPTY: number;
-	export var WSAEPROCLIM: number;
-	export var WSAEUSERS: number;
-	export var WSAEDQUOT: number;
-	export var WSAESTALE: number;
-	export var WSAEREMOTE: number;
-	export var WSASYSNOTREADY: number;
-	export var WSAVERNOTSUPPORTED: number;
-	export var WSANOTINITIALISED: number;
-	export var WSAEDISCON: number;
-	export var WSAENOMORE: number;
-	export var WSAECANCELLED: number;
-	export var WSAEINVALIDPROCTABLE: number;
-	export var WSAEINVALIDPROVIDER: number;
-	export var WSAEPROVIDERFAILEDINIT: number;
-	export var WSASYSCALLFAILURE: number;
-	export var WSASERVICE_NOT_FOUND: number;
-	export var WSATYPE_NOT_FOUND: number;
-	export var WSA_E_NO_MORE: number;
-	export var WSA_E_CANCELLED: number;
-	export var WSAEREFUSED: number;
-	export var SIGHUP: number;
-	export var SIGINT: number;
-	export var SIGILL: number;
-	export var SIGABRT: number;
-	export var SIGFPE: number;
-	export var SIGKILL: number;
-	export var SIGSEGV: number;
-	export var SIGTERM: number;
-	export var SIGBREAK: number;
-	export var SIGWINCH: number;
-	export var SSL_OP_ALL: number;
-	export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
-	export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
-	export var SSL_OP_CISCO_ANYCONNECT: number;
-	export var SSL_OP_COOKIE_EXCHANGE: number;
-	export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
-	export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
-	export var SSL_OP_EPHEMERAL_RSA: number;
-	export var SSL_OP_LEGACY_SERVER_CONNECT: number;
-	export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
-	export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
-	export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
-	export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
-	export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
-	export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
-	export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
-	export var SSL_OP_NO_COMPRESSION: number;
-	export var SSL_OP_NO_QUERY_MTU: number;
-	export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
-	export var SSL_OP_NO_SSLv2: number;
-	export var SSL_OP_NO_SSLv3: number;
-	export var SSL_OP_NO_TICKET: number;
-	export var SSL_OP_NO_TLSv1: number;
-	export var SSL_OP_NO_TLSv1_1: number;
-	export var SSL_OP_NO_TLSv1_2: number;
-	export var SSL_OP_PKCS1_CHECK_1: number;
-	export var SSL_OP_PKCS1_CHECK_2: number;
-	export var SSL_OP_SINGLE_DH_USE: number;
-	export var SSL_OP_SINGLE_ECDH_USE: number;
-	export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
-	export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
-	export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
-	export var SSL_OP_TLS_D5_BUG: number;
-	export var SSL_OP_TLS_ROLLBACK_BUG: number;
-	export var ENGINE_METHOD_DSA: number;
-	export var ENGINE_METHOD_DH: number;
-	export var ENGINE_METHOD_RAND: number;
-	export var ENGINE_METHOD_ECDH: number;
-	export var ENGINE_METHOD_ECDSA: number;
-	export var ENGINE_METHOD_CIPHERS: number;
-	export var ENGINE_METHOD_DIGESTS: number;
-	export var ENGINE_METHOD_STORE: number;
-	export var ENGINE_METHOD_PKEY_METHS: number;
-	export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
-	export var ENGINE_METHOD_ALL: number;
-	export var ENGINE_METHOD_NONE: number;
-	export var DH_CHECK_P_NOT_SAFE_PRIME: number;
-	export var DH_CHECK_P_NOT_PRIME: number;
-	export var DH_UNABLE_TO_CHECK_GENERATOR: number;
-	export var DH_NOT_SUITABLE_GENERATOR: number;
-	export var NPN_ENABLED: number;
-	export var RSA_PKCS1_PADDING: number;
-	export var RSA_SSLV23_PADDING: number;
-	export var RSA_NO_PADDING: number;
-	export var RSA_PKCS1_OAEP_PADDING: number;
-	export var RSA_X931_PADDING: number;
-	export var RSA_PKCS1_PSS_PADDING: number;
-	export var POINT_CONVERSION_COMPRESSED: number;
-	export var POINT_CONVERSION_UNCOMPRESSED: number;
-	export var POINT_CONVERSION_HYBRID: number;
-	export var O_RDONLY: number;
-	export var O_WRONLY: number;
-	export var O_RDWR: number;
-	export var S_IFMT: number;
-	export var S_IFREG: number;
-	export var S_IFDIR: number;
-	export var S_IFCHR: number;
-	export var S_IFBLK: number;
-	export var S_IFIFO: number;
-	export var S_IFSOCK: number;
-	export var S_IRWXU: number;
-	export var S_IRUSR: number;
-	export var S_IWUSR: number;
-	export var S_IXUSR: number;
-	export var S_IRWXG: number;
-	export var S_IRGRP: number;
-	export var S_IWGRP: number;
-	export var S_IXGRP: number;
-	export var S_IRWXO: number;
-	export var S_IROTH: number;
-	export var S_IWOTH: number;
-	export var S_IXOTH: number;
-	export var S_IFLNK: number;
-	export var O_CREAT: number;
-	export var O_EXCL: number;
-	export var O_NOCTTY: number;
-	export var O_DIRECTORY: number;
-	export var O_NOATIME: number;
-	export var O_NOFOLLOW: number;
-	export var O_SYNC: number;
-	export var O_SYMLINK: number;
-	export var O_DIRECT: number;
-	export var O_NONBLOCK: number;
-	export var O_TRUNC: number;
-	export var O_APPEND: number;
-	export var F_OK: number;
-	export var R_OK: number;
-	export var W_OK: number;
-	export var X_OK: number;
-	export var UV_UDP_REUSEADDR: number;
-	export var SIGQUIT: number;
-	export var SIGTRAP: number;
-	export var SIGIOT: number;
-	export var SIGBUS: number;
-	export var SIGUSR1: number;
-	export var SIGUSR2: number;
-	export var SIGPIPE: number;
-	export var SIGALRM: number;
-	export var SIGCHLD: number;
-	export var SIGSTKFLT: number;
-	export var SIGCONT: number;
-	export var SIGSTOP: number;
-	export var SIGTSTP: number;
-	export var SIGTTIN: number;
-	export var SIGTTOU: number;
-	export var SIGURG: number;
-	export var SIGXCPU: number;
-	export var SIGXFSZ: number;
-	export var SIGVTALRM: number;
-	export var SIGPROF: number;
-	export var SIGIO: number;
-	export var SIGPOLL: number;
-	export var SIGPWR: number;
-	export var SIGSYS: number;
-	export var SIGUNUSED: number;
-	export var defaultCoreCipherList: string;
-	export var defaultCipherList: string;
-	export var ENGINE_METHOD_RSA: number;
-	export var ALPN_ENABLED: number;
+    export var E2BIG: number;
+    export var EACCES: number;
+    export var EADDRINUSE: number;
+    export var EADDRNOTAVAIL: number;
+    export var EAFNOSUPPORT: number;
+    export var EAGAIN: number;
+    export var EALREADY: number;
+    export var EBADF: number;
+    export var EBADMSG: number;
+    export var EBUSY: number;
+    export var ECANCELED: number;
+    export var ECHILD: number;
+    export var ECONNABORTED: number;
+    export var ECONNREFUSED: number;
+    export var ECONNRESET: number;
+    export var EDEADLK: number;
+    export var EDESTADDRREQ: number;
+    export var EDOM: number;
+    export var EEXIST: number;
+    export var EFAULT: number;
+    export var EFBIG: number;
+    export var EHOSTUNREACH: number;
+    export var EIDRM: number;
+    export var EILSEQ: number;
+    export var EINPROGRESS: number;
+    export var EINTR: number;
+    export var EINVAL: number;
+    export var EIO: number;
+    export var EISCONN: number;
+    export var EISDIR: number;
+    export var ELOOP: number;
+    export var EMFILE: number;
+    export var EMLINK: number;
+    export var EMSGSIZE: number;
+    export var ENAMETOOLONG: number;
+    export var ENETDOWN: number;
+    export var ENETRESET: number;
+    export var ENETUNREACH: number;
+    export var ENFILE: number;
+    export var ENOBUFS: number;
+    export var ENODATA: number;
+    export var ENODEV: number;
+    export var ENOENT: number;
+    export var ENOEXEC: number;
+    export var ENOLCK: number;
+    export var ENOLINK: number;
+    export var ENOMEM: number;
+    export var ENOMSG: number;
+    export var ENOPROTOOPT: number;
+    export var ENOSPC: number;
+    export var ENOSR: number;
+    export var ENOSTR: number;
+    export var ENOSYS: number;
+    export var ENOTCONN: number;
+    export var ENOTDIR: number;
+    export var ENOTEMPTY: number;
+    export var ENOTSOCK: number;
+    export var ENOTSUP: number;
+    export var ENOTTY: number;
+    export var ENXIO: number;
+    export var EOPNOTSUPP: number;
+    export var EOVERFLOW: number;
+    export var EPERM: number;
+    export var EPIPE: number;
+    export var EPROTO: number;
+    export var EPROTONOSUPPORT: number;
+    export var EPROTOTYPE: number;
+    export var ERANGE: number;
+    export var EROFS: number;
+    export var ESPIPE: number;
+    export var ESRCH: number;
+    export var ETIME: number;
+    export var ETIMEDOUT: number;
+    export var ETXTBSY: number;
+    export var EWOULDBLOCK: number;
+    export var EXDEV: number;
+    export var WSAEINTR: number;
+    export var WSAEBADF: number;
+    export var WSAEACCES: number;
+    export var WSAEFAULT: number;
+    export var WSAEINVAL: number;
+    export var WSAEMFILE: number;
+    export var WSAEWOULDBLOCK: number;
+    export var WSAEINPROGRESS: number;
+    export var WSAEALREADY: number;
+    export var WSAENOTSOCK: number;
+    export var WSAEDESTADDRREQ: number;
+    export var WSAEMSGSIZE: number;
+    export var WSAEPROTOTYPE: number;
+    export var WSAENOPROTOOPT: number;
+    export var WSAEPROTONOSUPPORT: number;
+    export var WSAESOCKTNOSUPPORT: number;
+    export var WSAEOPNOTSUPP: number;
+    export var WSAEPFNOSUPPORT: number;
+    export var WSAEAFNOSUPPORT: number;
+    export var WSAEADDRINUSE: number;
+    export var WSAEADDRNOTAVAIL: number;
+    export var WSAENETDOWN: number;
+    export var WSAENETUNREACH: number;
+    export var WSAENETRESET: number;
+    export var WSAECONNABORTED: number;
+    export var WSAECONNRESET: number;
+    export var WSAENOBUFS: number;
+    export var WSAEISCONN: number;
+    export var WSAENOTCONN: number;
+    export var WSAESHUTDOWN: number;
+    export var WSAETOOMANYREFS: number;
+    export var WSAETIMEDOUT: number;
+    export var WSAECONNREFUSED: number;
+    export var WSAELOOP: number;
+    export var WSAENAMETOOLONG: number;
+    export var WSAEHOSTDOWN: number;
+    export var WSAEHOSTUNREACH: number;
+    export var WSAENOTEMPTY: number;
+    export var WSAEPROCLIM: number;
+    export var WSAEUSERS: number;
+    export var WSAEDQUOT: number;
+    export var WSAESTALE: number;
+    export var WSAEREMOTE: number;
+    export var WSASYSNOTREADY: number;
+    export var WSAVERNOTSUPPORTED: number;
+    export var WSANOTINITIALISED: number;
+    export var WSAEDISCON: number;
+    export var WSAENOMORE: number;
+    export var WSAECANCELLED: number;
+    export var WSAEINVALIDPROCTABLE: number;
+    export var WSAEINVALIDPROVIDER: number;
+    export var WSAEPROVIDERFAILEDINIT: number;
+    export var WSASYSCALLFAILURE: number;
+    export var WSASERVICE_NOT_FOUND: number;
+    export var WSATYPE_NOT_FOUND: number;
+    export var WSA_E_NO_MORE: number;
+    export var WSA_E_CANCELLED: number;
+    export var WSAEREFUSED: number;
+    export var SIGHUP: number;
+    export var SIGINT: number;
+    export var SIGILL: number;
+    export var SIGABRT: number;
+    export var SIGFPE: number;
+    export var SIGKILL: number;
+    export var SIGSEGV: number;
+    export var SIGTERM: number;
+    export var SIGBREAK: number;
+    export var SIGWINCH: number;
+    export var SSL_OP_ALL: number;
+    export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+    export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+    export var SSL_OP_CISCO_ANYCONNECT: number;
+    export var SSL_OP_COOKIE_EXCHANGE: number;
+    export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+    export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+    export var SSL_OP_EPHEMERAL_RSA: number;
+    export var SSL_OP_LEGACY_SERVER_CONNECT: number;
+    export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+    export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+    export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+    export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
+    export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+    export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NO_COMPRESSION: number;
+    export var SSL_OP_NO_QUERY_MTU: number;
+    export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+    export var SSL_OP_NO_SSLv2: number;
+    export var SSL_OP_NO_SSLv3: number;
+    export var SSL_OP_NO_TICKET: number;
+    export var SSL_OP_NO_TLSv1: number;
+    export var SSL_OP_NO_TLSv1_1: number;
+    export var SSL_OP_NO_TLSv1_2: number;
+    export var SSL_OP_PKCS1_CHECK_1: number;
+    export var SSL_OP_PKCS1_CHECK_2: number;
+    export var SSL_OP_SINGLE_DH_USE: number;
+    export var SSL_OP_SINGLE_ECDH_USE: number;
+    export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+    export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+    export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+    export var SSL_OP_TLS_D5_BUG: number;
+    export var SSL_OP_TLS_ROLLBACK_BUG: number;
+    export var ENGINE_METHOD_DSA: number;
+    export var ENGINE_METHOD_DH: number;
+    export var ENGINE_METHOD_RAND: number;
+    export var ENGINE_METHOD_ECDH: number;
+    export var ENGINE_METHOD_ECDSA: number;
+    export var ENGINE_METHOD_CIPHERS: number;
+    export var ENGINE_METHOD_DIGESTS: number;
+    export var ENGINE_METHOD_STORE: number;
+    export var ENGINE_METHOD_PKEY_METHS: number;
+    export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
+    export var ENGINE_METHOD_ALL: number;
+    export var ENGINE_METHOD_NONE: number;
+    export var DH_CHECK_P_NOT_SAFE_PRIME: number;
+    export var DH_CHECK_P_NOT_PRIME: number;
+    export var DH_UNABLE_TO_CHECK_GENERATOR: number;
+    export var DH_NOT_SUITABLE_GENERATOR: number;
+    export var NPN_ENABLED: number;
+    export var RSA_PKCS1_PADDING: number;
+    export var RSA_SSLV23_PADDING: number;
+    export var RSA_NO_PADDING: number;
+    export var RSA_PKCS1_OAEP_PADDING: number;
+    export var RSA_X931_PADDING: number;
+    export var RSA_PKCS1_PSS_PADDING: number;
+    export var POINT_CONVERSION_COMPRESSED: number;
+    export var POINT_CONVERSION_UNCOMPRESSED: number;
+    export var POINT_CONVERSION_HYBRID: number;
+    export var O_RDONLY: number;
+    export var O_WRONLY: number;
+    export var O_RDWR: number;
+    export var S_IFMT: number;
+    export var S_IFREG: number;
+    export var S_IFDIR: number;
+    export var S_IFCHR: number;
+    export var S_IFBLK: number;
+    export var S_IFIFO: number;
+    export var S_IFSOCK: number;
+    export var S_IRWXU: number;
+    export var S_IRUSR: number;
+    export var S_IWUSR: number;
+    export var S_IXUSR: number;
+    export var S_IRWXG: number;
+    export var S_IRGRP: number;
+    export var S_IWGRP: number;
+    export var S_IXGRP: number;
+    export var S_IRWXO: number;
+    export var S_IROTH: number;
+    export var S_IWOTH: number;
+    export var S_IXOTH: number;
+    export var S_IFLNK: number;
+    export var O_CREAT: number;
+    export var O_EXCL: number;
+    export var O_NOCTTY: number;
+    export var O_DIRECTORY: number;
+    export var O_NOATIME: number;
+    export var O_NOFOLLOW: number;
+    export var O_SYNC: number;
+    export var O_DSYNC: number;
+    export var O_SYMLINK: number;
+    export var O_DIRECT: number;
+    export var O_NONBLOCK: number;
+    export var O_TRUNC: number;
+    export var O_APPEND: number;
+    export var F_OK: number;
+    export var R_OK: number;
+    export var W_OK: number;
+    export var X_OK: number;
+    export var UV_UDP_REUSEADDR: number;
+    export var SIGQUIT: number;
+    export var SIGTRAP: number;
+    export var SIGIOT: number;
+    export var SIGBUS: number;
+    export var SIGUSR1: number;
+    export var SIGUSR2: number;
+    export var SIGPIPE: number;
+    export var SIGALRM: number;
+    export var SIGCHLD: number;
+    export var SIGSTKFLT: number;
+    export var SIGCONT: number;
+    export var SIGSTOP: number;
+    export var SIGTSTP: number;
+    export var SIGTTIN: number;
+    export var SIGTTOU: number;
+    export var SIGURG: number;
+    export var SIGXCPU: number;
+    export var SIGXFSZ: number;
+    export var SIGVTALRM: number;
+    export var SIGPROF: number;
+    export var SIGIO: number;
+    export var SIGPOLL: number;
+    export var SIGPWR: number;
+    export var SIGSYS: number;
+    export var SIGUNUSED: number;
+    export var defaultCoreCipherList: string;
+    export var defaultCipherList: string;
+    export var ENGINE_METHOD_RSA: number;
+    export var ALPN_ENABLED: number;
+}
+
+declare module "module" {
+    export = NodeJS.Module;
 }
 
 declare module "process" {
-	export = process;
+    export = process;
 }
 
+// tslint:disable-next-line:no-declare-current-package
 declare module "v8" {
-	interface HeapSpaceInfo {
-		space_name: string;
-		space_size: number;
-		space_used_size: number;
-		space_available_size: number;
-		physical_space_size: number;
-	}
+    interface HeapSpaceInfo {
+        space_name: string;
+        space_size: number;
+        space_used_size: number;
+        space_available_size: number;
+        physical_space_size: number;
+    }
 
-	//** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
-	type DoesZapCodeSpaceFlag = 0 | 1;
+    // ** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
+    type DoesZapCodeSpaceFlag = 0 | 1;
 
-	interface HeapInfo {
-		total_heap_size: number;
-		total_heap_size_executable: number;
-		total_physical_size: number;
-		total_available_size: number;
-		used_heap_size: number;
-		heap_size_limit: number;
-		malloced_memory: number;
-		peak_malloced_memory: number;
-		does_zap_garbage: DoesZapCodeSpaceFlag;
-	}
+    interface HeapInfo {
+        total_heap_size: number;
+        total_heap_size_executable: number;
+        total_physical_size: number;
+        total_available_size: number;
+        used_heap_size: number;
+        heap_size_limit: number;
+        malloced_memory: number;
+        peak_malloced_memory: number;
+        does_zap_garbage: DoesZapCodeSpaceFlag;
+    }
 
-	export function getHeapStatistics(): HeapInfo;
-	export function getHeapSpaceStatistics(): HeapSpaceInfo[];
-	export function setFlagsFromString(flags: string): void;
+    export function getHeapStatistics(): HeapInfo;
+    export function getHeapSpaceStatistics(): HeapSpaceInfo[];
+    export function setFlagsFromString(flags: string): void;
 }
 
 declare module "timers" {
-	export function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
-	export function clearTimeout(timeoutId: NodeJS.Timer): void;
-	export function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
-	export function clearInterval(intervalId: NodeJS.Timer): void;
-	export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
-	export function clearImmediate(immediateId: any): void;
+    export function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export namespace setTimeout {
+        export function __promisify__(ms: number): Promise<void>;
+        export function __promisify__<T>(ms: number, value: T): Promise<T>;
+    }
+    export function clearTimeout(timeoutId: NodeJS.Timer): void;
+    export function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export function clearInterval(intervalId: NodeJS.Timer): void;
+    export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+    export namespace setImmediate {
+        export function __promisify__(): Promise<void>;
+        export function __promisify__<T>(value: T): Promise<T>;
+    }
+    export function clearImmediate(immediateId: any): void;
 }
 
 declare module "console" {
-	export = console;
+    export = console;
 }
 
 /**
- * _debugger module is not documented.
- * Source code is at https://github.com/nodejs/node/blob/master/lib/_debugger.js
+ * Async Hooks module: https://nodejs.org/api/async_hooks.html
  */
-declare module "_debugger" {
-	export interface Packet {
-		raw: string;
-		headers: string[];
-		body: Message;
-	}
+declare module "async_hooks" {
+    /**
+     * Returns the asyncId of the current execution context.
+     */
+    export function executionAsyncId(): number;
+    /// @deprecated - replaced by executionAsyncId()
+    export function currentId(): number;
 
-	export interface Message {
-		seq: number;
-		type: string;
-	}
+    /**
+     * Returns the ID of the resource responsible for calling the callback that is currently being executed.
+     */
+    export function triggerAsyncId(): number;
+    /// @deprecated - replaced by triggerAsyncId()
+    export function triggerId(): number;
 
-	export interface RequestInfo {
-		command: string;
-		arguments: any;
-	}
+    export interface HookCallbacks {
+        /**
+         * Called when a class is constructed that has the possibility to emit an asynchronous event.
+         * @param asyncId a unique ID for the async resource
+         * @param type the type of the async resource
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         * @param resource reference to the resource representing the async operation, needs to be released during destroy
+         */
+        init?(asyncId: number, type: string, triggerAsyncId: number, resource: Object): void;
 
-	export interface Request extends Message, RequestInfo {
-	}
+        /**
+         * When an asynchronous operation is initiated or completes a callback is called to notify the user.
+         * The before callback is called just before said callback is executed.
+         * @param asyncId the unique identifier assigned to the resource about to execute the callback.
+         */
+        before?(asyncId: number): void;
 
-	export interface Event extends Message {
-		event: string;
-		body?: any;
-	}
+        /**
+         * Called immediately after the callback specified in before is completed.
+         * @param asyncId the unique identifier assigned to the resource which has executed the callback.
+         */
+        after?(asyncId: number): void;
 
-	export interface Response extends Message {
-		request_seq: number;
-		success: boolean;
-		/** Contains error message if success === false. */
-		message?: string;
-		/** Contains message body if success === true. */
-		body?: any;
-	}
+        /**
+         * Called when a promise has resolve() called. This may not be in the same execution id
+         * as the promise itself.
+         * @param asyncId the unique id for the promise that was resolve()d.
+         */
+        promiseResolve?(asyncId: number): void;
 
-	export interface BreakpointMessageBody {
-		type: string;
-		target: number;
-		line: number;
-	}
+        /**
+         * Called after the resource corresponding to asyncId is destroyed
+         * @param asyncId a unique ID for the async resource
+         */
+        destroy?(asyncId: number): void;
+    }
 
-	export class Protocol {
-		res: Packet;
-		state: string;
-		execute(data: string): void;
-		serialize(rq: Request): string;
-		onResponse: (pkt: Packet) => void;
-	}
+    export interface AsyncHook {
+        /**
+         * Enable the callbacks for a given AsyncHook instance. If no callbacks are provided enabling is a noop.
+         */
+        enable(): this;
 
-	export var NO_FRAME: number;
-	export var port: number;
+        /**
+         * Disable the callbacks for a given AsyncHook instance from the global pool of AsyncHook callbacks to be executed. Once a hook has been disabled it will not be called again until enabled.
+         */
+        disable(): this;
+    }
 
-	export interface ScriptDesc {
-		name: string;
-		id: number;
-		isNative?: boolean;
-		handle?: number;
-		type: string;
-		lineOffset?: number;
-		columnOffset?: number;
-		lineCount?: number;
-	}
+    /**
+     * Registers functions to be called for different lifetime events of each async operation.
+     * @param options the callbacks to register
+     * @return an AsyncHooks instance used for disabling and enabling hooks
+     */
+    export function createHook(options: HookCallbacks): AsyncHook;
 
-	export interface Breakpoint {
-		id: number;
-		scriptId: number;
-		script: ScriptDesc;
-		line: number;
-		condition?: string;
-		scriptReq?: string;
-	}
+    /**
+     * The class AsyncResource was designed to be extended by the embedder's async resources.
+     * Using this users can easily trigger the lifetime events of their own resources.
+     */
+    export class AsyncResource {
+        /**
+         * AsyncResource() is meant to be extended. Instantiating a
+         * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
+         * async_hook.executionAsyncId() is used.
+         * @param type the name of this async resource type
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         */
+        constructor(type: string, triggerAsyncId?: number)
 
-	export interface RequestHandler {
-		(err: boolean, body: Message, res: Packet): void;
-		request_seq?: number;
-	}
+        /**
+         * Call AsyncHooks before callbacks.
+         */
+        emitBefore(): void;
 
-	export interface ResponseBodyHandler {
-		(err: boolean, body?: any): void;
-		request_seq?: number;
-	}
+        /**
+         * Call AsyncHooks after callbacks
+         */
+        emitAfter(): void;
 
-	export interface ExceptionInfo {
-		text: string;
-	}
+        /**
+         * Call AsyncHooks destroy callbacks.
+         */
+        emitDestroy(): void;
 
-	export interface BreakResponse {
-		script?: ScriptDesc;
-		exception?: ExceptionInfo;
-		sourceLine: number;
-		sourceLineText: string;
-		sourceColumn: number;
-	}
+        /**
+         * @return the unique ID assigned to this AsyncResource instance.
+         */
+        asyncId(): number;
 
-	export function SourceInfo(body: BreakResponse): string;
-
-	export interface ClientInstance extends NodeJS.EventEmitter {
-		protocol: Protocol;
-		scripts: ScriptDesc[];
-		handles: ScriptDesc[];
-		breakpoints: Breakpoint[];
-		currentSourceLine: number;
-		currentSourceColumn: number;
-		currentSourceLineText: string;
-		currentFrame: number;
-		currentScript: string;
-
-		connect(port: number, host: string): void;
-		req(req: any, cb: RequestHandler): void;
-		reqFrameEval(code: string, frame: number, cb: RequestHandler): void;
-		mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void;
-		setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void;
-		clearBreakpoint(rq: Request, cb: RequestHandler): void;
-		listbreakpoints(cb: RequestHandler): void;
-		reqSource(from: number, to: number, cb: RequestHandler): void;
-		reqScripts(cb: any): void;
-		reqContinue(cb: RequestHandler): void;
-	}
-
-	export var Client: {
-		new(): ClientInstance
-	}
+        /**
+         * @return the trigger ID for this AsyncResource instance.
+         */
+        triggerAsyncId(): number;
+    }
 }
+
+declare module "http2" {
+    import * as events from "events";
+    import * as fs from "fs";
+    import * as net from "net";
+    import * as stream from "stream";
+    import * as tls from "tls";
+    import * as url from "url";
+
+    import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+    export { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+
+    // Http2Stream
+
+    export interface StreamPriorityOptions {
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        silent?: boolean;
+    }
+
+    export interface StreamState {
+        localWindowSize?: number;
+        state?: number;
+        streamLocalClose?: number;
+        streamRemoteClose?: number;
+        sumDependencyWeight?: number;
+        weight?: number;
+    }
+
+    export interface ServerStreamResponseOptions {
+        endStream?: boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+    }
+
+    export interface StatOptions {
+        offset: number;
+        length: number;
+    }
+
+    export interface ServerStreamFileResponseOptions {
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void | boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+        offset?: number;
+        length?: number;
+    }
+
+    export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
+        onError?: (err: NodeJS.ErrnoException) => void;
+    }
+
+    export interface Http2Stream extends stream.Duplex {
+        readonly aborted: boolean;
+        readonly destroyed: boolean;
+        priority(options: StreamPriorityOptions): void;
+        readonly rstCode: number;
+        rstStream(code: number): void;
+        rstWithNoError(): void;
+        rstWithProtocolError(): void;
+        rstWithCancel(): void;
+        rstWithRefuse(): void;
+        rstWithInternalError(): void;
+        readonly session: Http2Session;
+        setTimeout(msecs: number, callback?: () => void): void;
+        readonly state: StreamState;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: () => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "streamClosed", listener: (code: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted"): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "data", chunk: Buffer | string): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "finish"): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number): boolean;
+        emit(event: "pipe", src: stream.Readable): boolean;
+        emit(event: "unpipe", src: stream.Readable): boolean;
+        emit(event: "streamClosed", code: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "trailers", trailers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: () => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "data", listener: (chunk: Buffer | string) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        on(event: "pipe", listener: (src: stream.Readable) => void): this;
+        on(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        on(event: "streamClosed", listener: (code: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: () => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "data", listener: (chunk: Buffer | string) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        once(event: "pipe", listener: (src: stream.Readable) => void): this;
+        once(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        once(event: "streamClosed", listener: (code: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: () => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: () => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ClientHttp2Stream extends Http2Stream {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "headers", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "response", headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Stream extends Http2Stream {
+        additionalHeaders(headers: OutgoingHttpHeaders): void;
+        readonly headersSent: boolean;
+        readonly pushAllowed: boolean;
+        pushStream(headers: OutgoingHttpHeaders, callback?: (pushStream: ServerHttp2Stream) => void): void;
+        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (pushStream: ServerHttp2Stream) => void): void;
+        respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
+        respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
+        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
+    }
+
+    // Http2Session
+
+    export interface Settings {
+        headerTableSize?: number;
+        enablePush?: boolean;
+        initialWindowSize?: number;
+        maxFrameSize?: number;
+        maxConcurrentStreams?: number;
+        maxHeaderListSize?: number;
+    }
+
+    export interface ClientSessionRequestOptions {
+        endStream?: boolean;
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
+    }
+
+    export interface SessionShutdownOptions {
+        graceful?: boolean;
+        errorCode?: number;
+        lastStreamID?: number;
+        opaqueData?: Buffer | Uint8Array;
+    }
+
+    export interface SessionState {
+        effectiveLocalWindowSize?: number;
+        effectiveRecvDataLength?: number;
+        nextStreamID?: number;
+        localWindowSize?: number;
+        lastProcStreamID?: number;
+        remoteWindowSize?: number;
+        outboundQueueSize?: number;
+        deflateDynamicTableSize?: number;
+        inflateDynamicTableSize?: number;
+    }
+
+    export interface Http2Session extends events.EventEmitter {
+        destroy(): void;
+        readonly destroyed: boolean;
+        readonly localSettings: Settings;
+        readonly pendingSettingsAck: boolean;
+        readonly remoteSettings: Settings;
+        rstStream(stream: Http2Stream, code?: number): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        shutdown(callback?: () => void): void;
+        shutdown(options: SessionShutdownOptions, callback?: () => void): void;
+        readonly socket: net.Socket | tls.TLSSocket;
+        readonly state: SessionState;
+        priority(stream: Http2Stream, options: StreamPriorityOptions): void;
+        settings(settings: Settings): void;
+        readonly type: number;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        addListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number, streamID: number): boolean;
+        emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
+        emit(event: "localSettings", settings: Settings): boolean;
+        emit(event: "remoteSettings", settings: Settings): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        on(event: "localSettings", listener: (settings: Settings) => void): this;
+        on(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        once(event: "localSettings", listener: (settings: Settings) => void): this;
+        once(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface ClientHttp2Session extends Http2Session {
+        request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Session extends Http2Session {
+        readonly server: Http2Server | Http2SecureServer;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    // Http2Server
+
+    export interface SessionOptions {
+        maxDeflateDynamicTableSize?: number;
+        maxReservedRemoteStreams?: number;
+        maxSendHeaderBlockLength?: number;
+        paddingStrategy?: number;
+        peerMaxConcurrentStreams?: number;
+        selectPadding?: (frameLen: number, maxFrameLen: number) => number;
+        settings?: Settings;
+    }
+
+    export type ClientSessionOptions = SessionOptions;
+    export type ServerSessionOptions = SessionOptions;
+
+    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
+    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
+
+    export interface ServerOptions extends ServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface SecureServerOptions extends SecureServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface Http2Server extends net.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface Http2SecureServer extends tls.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+    }
+
+    export interface Http2ServerRequest extends stream.Readable {
+        headers: IncomingHttpHeaders;
+        httpVersion: string;
+        method: string;
+        rawHeaders: string[];
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        stream: ServerHttp2Stream;
+        trailers: IncomingHttpHeaders;
+        url: string;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+    }
+
+    export interface Http2ServerResponse extends events.EventEmitter {
+        addTrailers(trailers: OutgoingHttpHeaders): void;
+        connection: net.Socket | tls.TLSSocket;
+        end(callback?: () => void): void;
+        end(data?: string | Buffer, callback?: () => void): void;
+        end(data?: string | Buffer, encoding?: string, callback?: () => void): void;
+        readonly finished: boolean;
+        getHeader(name: string): string;
+        getHeaderNames(): string[];
+        getHeaders(): OutgoingHttpHeaders;
+        hasHeader(name: string): boolean;
+        readonly headersSent: boolean;
+        removeHeader(name: string): void;
+        sendDate: boolean;
+        setHeader(name: string, value: number | string | string[]): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        statusCode: number;
+        statusMessage: '';
+        stream: ServerHttp2Stream;
+        write(chunk: string | Buffer, callback?: (err: Error) => void): boolean;
+        write(chunk: string | Buffer, encoding?: string, callback?: (err: Error) => void): boolean;
+        writeContinue(): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, statusMessage?: string, headers?: OutgoingHttpHeaders): void;
+        createPushResponse(headers: OutgoingHttpHeaders, callback: (err: Error | null, res: Http2ServerResponse) => void): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "finish"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+    }
+
+    // Public API
+
+    export namespace constants {
+        export const NGHTTP2_SESSION_SERVER: number;
+        export const NGHTTP2_SESSION_CLIENT: number;
+        export const NGHTTP2_STREAM_STATE_IDLE: number;
+        export const NGHTTP2_STREAM_STATE_OPEN: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_CLOSED: number;
+        export const NGHTTP2_NO_ERROR: number;
+        export const NGHTTP2_PROTOCOL_ERROR: number;
+        export const NGHTTP2_INTERNAL_ERROR: number;
+        export const NGHTTP2_FLOW_CONTROL_ERROR: number;
+        export const NGHTTP2_SETTINGS_TIMEOUT: number;
+        export const NGHTTP2_STREAM_CLOSED: number;
+        export const NGHTTP2_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_REFUSED_STREAM: number;
+        export const NGHTTP2_CANCEL: number;
+        export const NGHTTP2_COMPRESSION_ERROR: number;
+        export const NGHTTP2_CONNECT_ERROR: number;
+        export const NGHTTP2_ENHANCE_YOUR_CALM: number;
+        export const NGHTTP2_INADEQUATE_SECURITY: number;
+        export const NGHTTP2_HTTP_1_1_REQUIRED: number;
+        export const NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_FLAG_NONE: number;
+        export const NGHTTP2_FLAG_END_STREAM: number;
+        export const NGHTTP2_FLAG_END_HEADERS: number;
+        export const NGHTTP2_FLAG_ACK: number;
+        export const NGHTTP2_FLAG_PADDED: number;
+        export const NGHTTP2_FLAG_PRIORITY: number;
+        export const DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const DEFAULT_SETTINGS_ENABLE_PUSH: number;
+        export const DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
+        export const MAX_MAX_FRAME_SIZE: number;
+        export const MIN_MAX_FRAME_SIZE: number;
+        export const MAX_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_DEFAULT_WEIGHT: number;
+        export const NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const NGHTTP2_SETTINGS_ENABLE_PUSH: number;
+        export const NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
+        export const NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
+        export const PADDING_STRATEGY_NONE: number;
+        export const PADDING_STRATEGY_MAX: number;
+        export const PADDING_STRATEGY_CALLBACK: number;
+        export const HTTP2_HEADER_STATUS: string;
+        export const HTTP2_HEADER_METHOD: string;
+        export const HTTP2_HEADER_AUTHORITY: string;
+        export const HTTP2_HEADER_SCHEME: string;
+        export const HTTP2_HEADER_PATH: string;
+        export const HTTP2_HEADER_ACCEPT_CHARSET: string;
+        export const HTTP2_HEADER_ACCEPT_ENCODING: string;
+        export const HTTP2_HEADER_ACCEPT_LANGUAGE: string;
+        export const HTTP2_HEADER_ACCEPT_RANGES: string;
+        export const HTTP2_HEADER_ACCEPT: string;
+        export const HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
+        export const HTTP2_HEADER_AGE: string;
+        export const HTTP2_HEADER_ALLOW: string;
+        export const HTTP2_HEADER_AUTHORIZATION: string;
+        export const HTTP2_HEADER_CACHE_CONTROL: string;
+        export const HTTP2_HEADER_CONNECTION: string;
+        export const HTTP2_HEADER_CONTENT_DISPOSITION: string;
+        export const HTTP2_HEADER_CONTENT_ENCODING: string;
+        export const HTTP2_HEADER_CONTENT_LANGUAGE: string;
+        export const HTTP2_HEADER_CONTENT_LENGTH: string;
+        export const HTTP2_HEADER_CONTENT_LOCATION: string;
+        export const HTTP2_HEADER_CONTENT_MD5: string;
+        export const HTTP2_HEADER_CONTENT_RANGE: string;
+        export const HTTP2_HEADER_CONTENT_TYPE: string;
+        export const HTTP2_HEADER_COOKIE: string;
+        export const HTTP2_HEADER_DATE: string;
+        export const HTTP2_HEADER_ETAG: string;
+        export const HTTP2_HEADER_EXPECT: string;
+        export const HTTP2_HEADER_EXPIRES: string;
+        export const HTTP2_HEADER_FROM: string;
+        export const HTTP2_HEADER_HOST: string;
+        export const HTTP2_HEADER_IF_MATCH: string;
+        export const HTTP2_HEADER_IF_MODIFIED_SINCE: string;
+        export const HTTP2_HEADER_IF_NONE_MATCH: string;
+        export const HTTP2_HEADER_IF_RANGE: string;
+        export const HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
+        export const HTTP2_HEADER_LAST_MODIFIED: string;
+        export const HTTP2_HEADER_LINK: string;
+        export const HTTP2_HEADER_LOCATION: string;
+        export const HTTP2_HEADER_MAX_FORWARDS: string;
+        export const HTTP2_HEADER_PREFER: string;
+        export const HTTP2_HEADER_PROXY_AUTHENTICATE: string;
+        export const HTTP2_HEADER_PROXY_AUTHORIZATION: string;
+        export const HTTP2_HEADER_RANGE: string;
+        export const HTTP2_HEADER_REFERER: string;
+        export const HTTP2_HEADER_REFRESH: string;
+        export const HTTP2_HEADER_RETRY_AFTER: string;
+        export const HTTP2_HEADER_SERVER: string;
+        export const HTTP2_HEADER_SET_COOKIE: string;
+        export const HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
+        export const HTTP2_HEADER_TRANSFER_ENCODING: string;
+        export const HTTP2_HEADER_TE: string;
+        export const HTTP2_HEADER_UPGRADE: string;
+        export const HTTP2_HEADER_USER_AGENT: string;
+        export const HTTP2_HEADER_VARY: string;
+        export const HTTP2_HEADER_VIA: string;
+        export const HTTP2_HEADER_WWW_AUTHENTICATE: string;
+        export const HTTP2_HEADER_HTTP2_SETTINGS: string;
+        export const HTTP2_HEADER_KEEP_ALIVE: string;
+        export const HTTP2_HEADER_PROXY_CONNECTION: string;
+        export const HTTP2_METHOD_ACL: string;
+        export const HTTP2_METHOD_BASELINE_CONTROL: string;
+        export const HTTP2_METHOD_BIND: string;
+        export const HTTP2_METHOD_CHECKIN: string;
+        export const HTTP2_METHOD_CHECKOUT: string;
+        export const HTTP2_METHOD_CONNECT: string;
+        export const HTTP2_METHOD_COPY: string;
+        export const HTTP2_METHOD_DELETE: string;
+        export const HTTP2_METHOD_GET: string;
+        export const HTTP2_METHOD_HEAD: string;
+        export const HTTP2_METHOD_LABEL: string;
+        export const HTTP2_METHOD_LINK: string;
+        export const HTTP2_METHOD_LOCK: string;
+        export const HTTP2_METHOD_MERGE: string;
+        export const HTTP2_METHOD_MKACTIVITY: string;
+        export const HTTP2_METHOD_MKCALENDAR: string;
+        export const HTTP2_METHOD_MKCOL: string;
+        export const HTTP2_METHOD_MKREDIRECTREF: string;
+        export const HTTP2_METHOD_MKWORKSPACE: string;
+        export const HTTP2_METHOD_MOVE: string;
+        export const HTTP2_METHOD_OPTIONS: string;
+        export const HTTP2_METHOD_ORDERPATCH: string;
+        export const HTTP2_METHOD_PATCH: string;
+        export const HTTP2_METHOD_POST: string;
+        export const HTTP2_METHOD_PRI: string;
+        export const HTTP2_METHOD_PROPFIND: string;
+        export const HTTP2_METHOD_PROPPATCH: string;
+        export const HTTP2_METHOD_PUT: string;
+        export const HTTP2_METHOD_REBIND: string;
+        export const HTTP2_METHOD_REPORT: string;
+        export const HTTP2_METHOD_SEARCH: string;
+        export const HTTP2_METHOD_TRACE: string;
+        export const HTTP2_METHOD_UNBIND: string;
+        export const HTTP2_METHOD_UNCHECKOUT: string;
+        export const HTTP2_METHOD_UNLINK: string;
+        export const HTTP2_METHOD_UNLOCK: string;
+        export const HTTP2_METHOD_UPDATE: string;
+        export const HTTP2_METHOD_UPDATEREDIRECTREF: string;
+        export const HTTP2_METHOD_VERSION_CONTROL: string;
+        export const HTTP_STATUS_CONTINUE: number;
+        export const HTTP_STATUS_SWITCHING_PROTOCOLS: number;
+        export const HTTP_STATUS_PROCESSING: number;
+        export const HTTP_STATUS_OK: number;
+        export const HTTP_STATUS_CREATED: number;
+        export const HTTP_STATUS_ACCEPTED: number;
+        export const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
+        export const HTTP_STATUS_NO_CONTENT: number;
+        export const HTTP_STATUS_RESET_CONTENT: number;
+        export const HTTP_STATUS_PARTIAL_CONTENT: number;
+        export const HTTP_STATUS_MULTI_STATUS: number;
+        export const HTTP_STATUS_ALREADY_REPORTED: number;
+        export const HTTP_STATUS_IM_USED: number;
+        export const HTTP_STATUS_MULTIPLE_CHOICES: number;
+        export const HTTP_STATUS_MOVED_PERMANENTLY: number;
+        export const HTTP_STATUS_FOUND: number;
+        export const HTTP_STATUS_SEE_OTHER: number;
+        export const HTTP_STATUS_NOT_MODIFIED: number;
+        export const HTTP_STATUS_USE_PROXY: number;
+        export const HTTP_STATUS_TEMPORARY_REDIRECT: number;
+        export const HTTP_STATUS_PERMANENT_REDIRECT: number;
+        export const HTTP_STATUS_BAD_REQUEST: number;
+        export const HTTP_STATUS_UNAUTHORIZED: number;
+        export const HTTP_STATUS_PAYMENT_REQUIRED: number;
+        export const HTTP_STATUS_FORBIDDEN: number;
+        export const HTTP_STATUS_NOT_FOUND: number;
+        export const HTTP_STATUS_METHOD_NOT_ALLOWED: number;
+        export const HTTP_STATUS_NOT_ACCEPTABLE: number;
+        export const HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
+        export const HTTP_STATUS_REQUEST_TIMEOUT: number;
+        export const HTTP_STATUS_CONFLICT: number;
+        export const HTTP_STATUS_GONE: number;
+        export const HTTP_STATUS_LENGTH_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_FAILED: number;
+        export const HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
+        export const HTTP_STATUS_URI_TOO_LONG: number;
+        export const HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
+        export const HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
+        export const HTTP_STATUS_EXPECTATION_FAILED: number;
+        export const HTTP_STATUS_TEAPOT: number;
+        export const HTTP_STATUS_MISDIRECTED_REQUEST: number;
+        export const HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
+        export const HTTP_STATUS_LOCKED: number;
+        export const HTTP_STATUS_FAILED_DEPENDENCY: number;
+        export const HTTP_STATUS_UNORDERED_COLLECTION: number;
+        export const HTTP_STATUS_UPGRADE_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_REQUIRED: number;
+        export const HTTP_STATUS_TOO_MANY_REQUESTS: number;
+        export const HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+        export const HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
+        export const HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
+        export const HTTP_STATUS_NOT_IMPLEMENTED: number;
+        export const HTTP_STATUS_BAD_GATEWAY: number;
+        export const HTTP_STATUS_SERVICE_UNAVAILABLE: number;
+        export const HTTP_STATUS_GATEWAY_TIMEOUT: number;
+        export const HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
+        export const HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
+        export const HTTP_STATUS_INSUFFICIENT_STORAGE: number;
+        export const HTTP_STATUS_LOOP_DETECTED: number;
+        export const HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
+        export const HTTP_STATUS_NOT_EXTENDED: number;
+        export const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
+    }
+
+    export function getDefaultSettings(): Settings;
+    export function getPackedSettings(settings: Settings): Settings;
+    export function getUnpackedSettings(buf: Buffer | Uint8Array): Settings;
+
+    export function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+    export function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+
+    export function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+    export function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+
+    export function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+    export function connect(authority: string | url.URL, options?: ClientSessionOptions | SecureClientSessionOptions, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+}
+
+declare module "perf_hooks" {
+    export interface PerformanceEntry {
+        /**
+         * The total number of milliseconds elapsed for this entry.
+         * This value will not be meaningful for all Performance Entry types.
+         */
+        readonly duration: number;
+
+        /**
+         * The name of the performance entry.
+         */
+        readonly name: string;
+
+        /**
+         * The high resolution millisecond timestamp marking the starting time of the Performance Entry.
+         */
+        readonly startTime: number;
+
+        /**
+         * The type of the performance entry.
+         * Currently it may be one of: 'node', 'mark', 'measure', 'gc', or 'function'.
+         */
+        readonly entryType: string;
+
+        /**
+         * When performanceEntry.entryType is equal to 'gc', the performance.kind property identifies
+         * the type of garbage collection operation that occurred.
+         * The value may be one of perf_hooks.constants.
+         */
+        readonly kind?: number;
+    }
+
+    export interface PerformanceNodeTiming extends PerformanceEntry {
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process completed bootstrap.
+         */
+        readonly bootstrapComplete: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing ended.
+         */
+        readonly clusterSetupEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing started.
+         */
+        readonly clusterSetupStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop exited.
+         */
+        readonly loopExit: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop started.
+         */
+        readonly loopStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load ended.
+         */
+        readonly moduleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load started.
+         */
+        readonly moduleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process was initialized.
+         */
+        readonly nodeStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load ended.
+         */
+        readonly preloadModuleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load started.
+         */
+        readonly preloadModuleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing ended.
+         */
+        readonly thirdPartyMainEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing started.
+         */
+        readonly thirdPartyMainStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the V8 platform was initialized.
+         */
+        readonly v8Start: number;
+    }
+
+    export interface Performance {
+        /**
+         * If name is not provided, removes all PerformanceFunction objects from the Performance Timeline.
+         * If name is provided, removes entries with name.
+         * @param name
+         */
+        clearFunctions(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMark objects from the Performance Timeline.
+         * If name is provided, removes only the named mark.
+         * @param name
+         */
+        clearMarks(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMeasure objects from the Performance Timeline.
+         * If name is provided, removes only objects whose performanceEntry.name matches name.
+         */
+        clearMeasures(name?: string): void;
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         * @return list of all PerformanceEntry objects
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         * @param name
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+
+        /**
+         * Creates a new PerformanceMark entry in the Performance Timeline.
+         * A PerformanceMark is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'mark',
+         * and whose performanceEntry.duration is always 0.
+         * Performance marks are used to mark specific significant moments in the Performance Timeline.
+         * @param name
+         */
+        mark(name?: string): void;
+
+        /**
+         * Creates a new PerformanceMeasure entry in the Performance Timeline.
+         * A PerformanceMeasure is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'measure',
+         * and whose performanceEntry.duration measures the number of milliseconds elapsed since startMark and endMark.
+         *
+         * The startMark argument may identify any existing PerformanceMark in the the Performance Timeline, or may identify
+         * any of the timestamp properties provided by the PerformanceNodeTiming class. If the named startMark does not exist,
+         * then startMark is set to timeOrigin by default.
+         *
+         * The endMark argument must identify any existing PerformanceMark in the the Performance Timeline or any of the timestamp
+         * properties provided by the PerformanceNodeTiming class. If the named endMark does not exist, an error will be thrown.
+         * @param name
+         * @param startMark
+         * @param endMark
+         */
+        measure(name: string, startMark: string, endMark: string): void;
+
+        /**
+         * An instance of the PerformanceNodeTiming class that provides performance metrics for specific Node.js operational milestones.
+         */
+        readonly nodeTiming: PerformanceNodeTiming;
+
+        /**
+         * @return the current high resolution millisecond timestamp
+         */
+        now(): number;
+
+        /**
+         * The timeOrigin specifies the high resolution millisecond timestamp from which all performance metric durations are measured.
+         */
+        readonly timeOrigin: number;
+
+        /**
+         * Wraps a function within a new function that measures the running time of the wrapped function.
+         * A PerformanceObserver must be subscribed to the 'function' event type in order for the timing details to be accessed.
+         * @param fn
+         */
+        timerify<T extends (...optionalParams: any[]) => any>(fn: T): T;
+    }
+
+    export interface PerformanceObserverEntryList {
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * @return Returns a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+    }
+
+    export type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
+
+    export class PerformanceObserver {
+        constructor(callback: PerformanceObserverCallback);
+
+        /**
+         * Disconnects the PerformanceObserver instance from all notifications.
+         */
+        disconnect(): void;
+
+        /**
+         * Subscribes the PerformanceObserver instance to notifications of new PerformanceEntry instances identified by options.entryTypes.
+         * When options.buffered is false, the callback will be invoked once for every PerformanceEntry instance.
+         * Property buffered defaults to false.
+         * @param options
+         */
+        observe(options: { entryTypes: string[], buffered?: boolean }): void;
+    }
+
+    export namespace constants {
+        export const NODE_PERFORMANCE_GC_MAJOR: number;
+        export const NODE_PERFORMANCE_GC_MINOR: number;
+        export const NODE_PERFORMANCE_GC_INCREMENTAL: number;
+        export const NODE_PERFORMANCE_GC_WEAKCB: number;
+    }
+
+    const performance: Performance;
+}
\ No newline at end of file
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index 8c351239652..1b61d41e675 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -381,7 +381,7 @@ export interface IQueuedSender {
 // queue is free again to consume messages.
 // On Windows we always wait for the send() method to return before sending the next message
 // to workaround https://github.com/nodejs/node/issues/7657 (IPC can freeze process)
-export function createQueuedSender(childProcess: cp.ChildProcess | NodeJS.Process): IQueuedSender {
+export function createQueuedSender(childProcess: cp.ChildProcess): IQueuedSender {
 	let msgQueue: string[] = [];
 	let useQueue = false;
 
diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts
index b3d3a11f3e3..79a067db70e 100644
--- a/src/vs/base/node/request.ts
+++ b/src/vs/base/node/request.ts
@@ -96,7 +96,7 @@ export function request(options: IRequestOptions): TPromise<IRequestContext> {
 						stream = stream.pipe(createGunzip());
 					}
 
-					c({ res, stream });
+					c({ res, stream } as IRequestContext);
 				}
 			});
 
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index e05fed736e1..3d2e505a023 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -75,7 +75,7 @@ suite('Arrays', () => {
 			for (let i = 1; i < array.length; i++) {
 				let n = array[i];
 				if (last > n) {
-					assert.fail(array.slice(i - 10, i + 10));
+					assert.fail(JSON.stringify(array.slice(i - 10, i + 10)));
 				}
 			}
 		}
diff --git a/src/vs/base/test/common/cache.test.ts b/src/vs/base/test/common/cache.test.ts
index 521c59b3375..c7bab09abd0 100644
--- a/src/vs/base/test/common/cache.test.ts
+++ b/src/vs/base/test/common/cache.test.ts
@@ -16,9 +16,9 @@ suite('Cache', () => {
 		const cache = new Cache(() => TPromise.as(counter++));
 
 		return cache.get()
-			.then(c => assert.equal(c, 0), () => assert.fail())
+			.then(c => assert.equal(c, 0), () => assert.fail('Unexpected assertion error'))
 			.then(() => cache.get())
-			.then(c => assert.equal(c, 0), () => assert.fail());
+			.then(c => assert.equal(c, 0), () => assert.fail('Unexpected assertion error'));
 	});
 
 	test('simple error', () => {
@@ -26,9 +26,9 @@ suite('Cache', () => {
 		const cache = new Cache(() => TPromise.wrapError(new Error(String(counter++))));
 
 		return cache.get()
-			.then(() => assert.fail(), err => assert.equal(err.message, 0))
+			.then(() => assert.fail('Unexpected assertion error'), err => assert.equal(err.message, 0))
 			.then(() => cache.get())
-			.then(() => assert.fail(), err => assert.equal(err.message, 0));
+			.then(() => assert.fail('Unexpected assertion error'), err => assert.equal(err.message, 0));
 	});
 
 	test('should retry cancellations', () => {
diff --git a/src/vs/base/test/node/processes/fixtures/fork.ts b/src/vs/base/test/node/processes/fixtures/fork.ts
index 10537b1b6cc..9729d543579 100644
--- a/src/vs/base/test/node/processes/fixtures/fork.ts
+++ b/src/vs/base/test/node/processes/fixtures/fork.ts
@@ -7,7 +7,7 @@
 
 import * as processes from 'vs/base/node/processes';
 
-const sender = processes.createQueuedSender(process);
+const sender = processes.createQueuedSender(<any>process);
 
 process.on('message', msg => {
 	sender.send(msg);
diff --git a/src/vs/base/test/node/processes/fixtures/fork_large.ts b/src/vs/base/test/node/processes/fixtures/fork_large.ts
index e89bc4bb394..df17dd8bdc0 100644
--- a/src/vs/base/test/node/processes/fixtures/fork_large.ts
+++ b/src/vs/base/test/node/processes/fixtures/fork_large.ts
@@ -7,7 +7,7 @@
 
 import * as processes from 'vs/base/node/processes';
 
-const sender = processes.createQueuedSender(process);
+const sender = processes.createQueuedSender(<any>process);
 
 process.on('message', msg => {
 	sender.send(msg);
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 47b3b15b814..6662a4d20e4 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { app, ipcMain as ipc, BrowserWindow } from 'electron';
+import { app, ipcMain as ipc } from 'electron';
 import * as platform from 'vs/base/common/platform';
 import { WindowsManager } from 'vs/code/electron-main/windows';
 import { IWindowsService, OpenContext, ActiveWindowManager } from 'vs/platform/windows/common/windows';
@@ -59,11 +59,14 @@ import { IssueChannel } from 'vs/platform/issue/common/issueIpc';
 import { IssueService } from 'vs/platform/issue/electron-main/issueService';
 import { LogLevelSetterChannel } from 'vs/platform/log/common/logIpc';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
+import { join } from 'path';
+import { copy } from 'vs/base/node/pfs';
 import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener';
 
 export class CodeApplication {
 
 	private static readonly MACHINE_ID_KEY = 'telemetry.machineId';
+	private static readonly LOCAL_STORAGE_BACKED_UP_KEY = 'localStorage.backedUp';
 
 	private toDispose: IDisposable[];
 	private windowsMainService: IWindowsMainService;
@@ -127,7 +130,7 @@ export class CodeApplication {
 			return srcUri.startsWith(URI.file(this.environmentService.appRoot.toLowerCase()).toString());
 		};
 
-		app.on('web-contents-created', (_event: any, contents) => {
+		app.on('web-contents-created', (event: any, contents) => {
 			contents.on('will-attach-webview', (event: Electron.Event, webPreferences, params) => {
 				delete webPreferences.preload;
 				webPreferences.nodeIntegration = false;
@@ -182,15 +185,15 @@ export class CodeApplication {
 			this.windowsMainService.openNewWindow(OpenContext.DESKTOP); //macOS native tab "+" button
 		});
 
-		ipc.on('vscode:exit', (_event: any, code: number) => {
+		ipc.on('vscode:exit', (event: any, code: number) => {
 			this.logService.trace('IPC#vscode:exit', code);
 
 			this.dispose();
 			this.lifecycleService.kill(code);
 		});
 
-		ipc.on('vscode:fetchShellEnv', (_event: any, windowId: number) => {
-			const { webContents } = BrowserWindow.fromId(windowId);
+		ipc.on('vscode:fetchShellEnv', event => {
+			const webContents = event.sender.webContents;
 			getShellEnvironment().then(shellEnv => {
 				if (!webContents.isDestroyed()) {
 					webContents.send('vscode:acceptShellEnv', shellEnv);
@@ -204,7 +207,7 @@ export class CodeApplication {
 			});
 		});
 
-		ipc.on('vscode:broadcast', (_event: any, windowId: number, broadcast: { channel: string; payload: any; }) => {
+		ipc.on('vscode:broadcast', (event: any, windowId: number, broadcast: { channel: string; payload: any; }) => {
 			if (this.windowsMainService && broadcast.channel && !isUndefinedOrNull(broadcast.payload)) {
 				this.logService.trace('IPC#vscode:broadcast', broadcast.channel, broadcast.payload);
 
@@ -261,38 +264,43 @@ export class CodeApplication {
 		this.logService.debug(`from: ${this.environmentService.appRoot}`);
 		this.logService.debug('args:', this.environmentService.args);
 
-		// Make sure we associate the program with the app user model id
-		// This will help Windows to associate the running program with
-		// any shortcut that is pinned to the taskbar and prevent showing
-		// two icons in the taskbar for the same app.
-		if (platform.isWindows && product.win32AppUserModelId) {
-			app.setAppUserModelId(product.win32AppUserModelId);
-		}
+		// Backup local storage (TODO@Ben remove me after a while)
+		this.logService.trace('Backing up localStorage if needed...');
+		return this.backupLocalStorage().then(() => {
 
-		// Create Electron IPC Server
-		this.electronIpcServer = new ElectronIPCServer();
+			// Make sure we associate the program with the app user model id
+			// This will help Windows to associate the running program with
+			// any shortcut that is pinned to the taskbar and prevent showing
+			// two icons in the taskbar for the same app.
+			if (platform.isWindows && product.win32AppUserModelId) {
+				app.setAppUserModelId(product.win32AppUserModelId);
+			}
 
-		// Resolve unique machine ID
-		this.logService.trace('Resolving machine identifier...');
-		return this.resolveMachineId().then(machineId => {
-			this.logService.trace(`Resolved machine identifier: ${machineId}`);
+			// Create Electron IPC Server
+			this.electronIpcServer = new ElectronIPCServer();
 
-			// Spawn shared process
-			this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
-			this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
+			// Resolve unique machine ID
+			this.logService.trace('Resolving machine identifier...');
+			return this.resolveMachineId().then(machineId => {
+				this.logService.trace(`Resolved machine identifier: ${machineId}`);
 
-			// Services
-			const appInstantiationService = this.initServices(machineId);
+				// Spawn shared process
+				this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
+				this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
 
-			// Setup Auth Handler
-			const authHandler = appInstantiationService.createInstance(ProxyAuthHandler);
-			this.toDispose.push(authHandler);
+				// Services
+				const appInstantiationService = this.initServices(machineId);
 
-			// Open Windows
-			appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor));
+				// Setup Auth Handler
+				const authHandler = appInstantiationService.createInstance(ProxyAuthHandler);
+				this.toDispose.push(authHandler);
 
-			// Post Open Windows Tasks
-			appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor));
+				// Open Windows
+				appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor));
+
+				// Post Open Windows Tasks
+				appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor));
+			});
 		});
 	}
 
@@ -311,6 +319,24 @@ export class CodeApplication {
 		});
 	}
 
+	private backupLocalStorage(): TPromise<void> {
+		const localStorageBackedUp = this.stateService.getItem<string>(CodeApplication.LOCAL_STORAGE_BACKED_UP_KEY);
+		if (localStorageBackedUp) {
+			return TPromise.wrap(void 0);
+		}
+
+		const afterBackupDone = () => {
+
+			// Remember in global storage
+			this.stateService.setItem(CodeApplication.LOCAL_STORAGE_BACKED_UP_KEY, true);
+		};
+
+		const localStorageFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage');
+		const localStorageJournalFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage-journal');
+
+		return copy(localStorageFile, `${localStorageFile}.vscbak`).then(() => copy(localStorageJournalFile, `${localStorageJournalFile}.vscbak`)).then(afterBackupDone, afterBackupDone);
+	}
+
 	private initServices(machineId: string): IInstantiationService {
 		const services = new ServiceCollection();
 
@@ -402,11 +428,12 @@ export class CodeApplication {
 		this.windowsMainService.ready(this.userEnv);
 
 		// Open our first window
+		const macOpenFiles = (<any>global).macOpenFiles as string[];
 		const context = !!process.env['VSCODE_CLI'] ? OpenContext.CLI : OpenContext.DESKTOP;
 		if (args['new-window'] && args._.length === 0) {
 			this.windowsMainService.open({ context, cli: args, forceNewWindow: true, forceEmpty: true, initialStartup: true }); // new window if "-n" was used without paths
-		} else if (global.macOpenFiles && global.macOpenFiles.length && (!args._ || !args._.length)) {
-			this.windowsMainService.open({ context: OpenContext.DOCK, cli: args, pathsToOpen: global.macOpenFiles, initialStartup: true }); // mac: open-file event received on startup
+		} else if (macOpenFiles && macOpenFiles.length && (!args._ || !args._.length)) {
+			this.windowsMainService.open({ context: OpenContext.DOCK, cli: args, pathsToOpen: macOpenFiles, initialStartup: true }); // mac: open-file event received on startup
 		} else {
 			this.windowsMainService.open({ context, cli: args, forceNewWindow: args['new-window'] || (!args._.length && args['unity-launch']), diffMode: args.diff, initialStartup: true }); // default: read paths from cli
 		}
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 9eb5162971c..63ecd4e8768 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -151,6 +151,13 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 				app.dock.show();
 			}
 
+			// Disable the GTK3 emoji picker as it intercepts ctrl+shift+e (and
+			// doesn't work)
+			if (platform.isLinux) {
+				process.env['GTK_IM_MODULE'] = 'gtk-im-context-simple';
+				process.env['XMODIFIERS'] = '@im=none';
+			}
+
 			// Set the VSCODE_PID variable here when we are sure we are the first
 			// instance to startup. Otherwise we would wrongly overwrite the PID
 			process.env['VSCODE_PID'] = String(process.pid);
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 442e70d33c9..cf0e42edf02 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -100,7 +100,7 @@ export class CodeMenu {
 		this.windowsMainService.onWindowClose(() => this.updateWorkspaceMenuItems());
 
 		// Listen to extension viewlets
-		ipc.on('vscode:extensionViewlets', (_event: any, rawExtensionViewlets: string) => {
+		ipc.on('vscode:extensionViewlets', (event: any, rawExtensionViewlets: string) => {
 			let extensionViewlets: IExtensionViewlet[] = [];
 			try {
 				extensionViewlets = JSON.parse(rawExtensionViewlets);
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index dbd4821bea1..71c3c37e58e 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -178,23 +178,6 @@ export class CodeWindow implements ICodeWindow {
 		this._win = new BrowserWindow(options);
 		this._id = this._win.id;
 
-		// Bug in Electron (https://github.com/electron/electron/issues/10862). On multi-monitor setups,
-		// it can happen that the position we set to the window is not the correct one on the display.
-		// To workaround, we ask the window for its position and set it again if not matching.
-		// This only applies if the window is not fullscreen or maximized and multiple monitors are used.
-		if (isWindows && !isFullscreenOrMaximized) {
-			try {
-				if (screen.getAllDisplays().length > 1) {
-					const [x, y] = this._win.getPosition();
-					if (x !== this.windowState.x || y !== this.windowState.y) {
-						this._win.setPosition(this.windowState.x, this.windowState.y, false);
-					}
-				}
-			} catch (err) {
-				this.logService.warn(`Unexpected error fixing window position on windows with multiple windows: ${err}\n${err.stack}`);
-			}
-		}
-
 		if (useCustomTitleStyle) {
 			this._win.setSheetOffset(22); // offset dialogs by the height of the custom title bar if we have any
 		}
@@ -598,7 +581,7 @@ export class CodeWindow implements ICodeWindow {
 
 		// Perf Counters
 		windowConfiguration.perfEntries = exportEntries();
-		windowConfiguration.perfStartTime = global.perfStartTime;
+		windowConfiguration.perfStartTime = (<any>global).perfStartTime;
 		windowConfiguration.perfWindowLoadTime = Date.now();
 
 		// Config (combination of process.argv and window configuration)
@@ -947,11 +930,6 @@ export class CodeWindow implements ICodeWindow {
 			this.touchBarGroups.push(groupTouchBar);
 		}
 
-		// Ugly workaround for native crash on macOS 10.12.1. We are not
-		// leveraging the API for changing the ESC touch bar item.
-		// See https://github.com/electron/electron/issues/10442
-		(<any>this._win)._setEscapeTouchBarItem = () => { };
-
 		this._win.setTouchBar(new TouchBar({ items: this.touchBarGroups }));
 	}
 
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 85f39a00a01..8f15684a41f 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -169,7 +169,7 @@ export class WindowsManager implements IWindowsMainService {
 		});
 
 		// React to workbench loaded events from windows
-		ipc.on('vscode:workbenchLoaded', (_event: any, windowId: number) => {
+		ipc.on('vscode:workbenchLoaded', (event: any, windowId: number) => {
 			this.logService.trace('IPC#vscode-workbenchLoaded');
 
 			const win = this.getWindowById(windowId);
diff --git a/src/vs/editor/contrib/rename/renameInputField.ts b/src/vs/editor/contrib/rename/renameInputField.ts
index 76f4feab71a..4eb6d89148d 100644
--- a/src/vs/editor/contrib/rename/renameInputField.ts
+++ b/src/vs/editor/contrib/rename/renameInputField.ts
@@ -192,7 +192,7 @@ export default class RenameInputField implements IContentWidget, IDisposable {
 			this._inputField.setSelectionRange(
 				parseInt(this._inputField.getAttribute('selectionStart')),
 				parseInt(this._inputField.getAttribute('selectionEnd')));
-		}, 25);
+		}, 100);
 	}
 
 	private _hide(): void {
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index 63b862035ec..b53ce735bfc 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -109,7 +109,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -128,7 +128,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -205,7 +205,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -224,7 +224,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -243,7 +243,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -263,7 +263,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -314,7 +314,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index aae291e1630..629ca60be86 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -49,7 +49,7 @@ export class DarwinUpdateService extends AbstractUpdateService {
 
 	protected setUpdateFeedUrl(quality: string): boolean {
 		try {
-			electron.autoUpdater.setFeedURL(createUpdateURL('darwin', quality));
+			electron.autoUpdater.setFeedURL({ url: createUpdateURL('darwin', quality) });
 		} catch (e) {
 			// application is very likely not signed
 			this.logService.error('Failed to set update feed URL');
diff --git a/src/vs/platform/url/electron-main/electronUrlListener.ts b/src/vs/platform/url/electron-main/electronUrlListener.ts
index 418e08c5b91..d228fdc23ef 100644
--- a/src/vs/platform/url/electron-main/electronUrlListener.ts
+++ b/src/vs/platform/url/electron-main/electronUrlListener.ts
@@ -32,7 +32,7 @@ export class ElectronURLListener {
 		@IURLService private urlService: IURLService,
 		@IWindowsMainService private windowsService: IWindowsMainService
 	) {
-		const globalBuffer = (global.getOpenUrls() || []) as string[];
+		const globalBuffer = ((<any>global).getOpenUrls() || []) as string[];
 		const rawBuffer = [
 			...(typeof initial === 'string' ? [initial] : initial),
 			...globalBuffer
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 6a68273d4c7..d4d5cc0e00c 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -24,11 +24,15 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ToggleActivityBarVisibilityAction } from 'vs/workbench/browser/actions/toggleActivityBarVisibility';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { CompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBar';
 import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
+import { isMacintosh } from 'vs/base/common/platform';
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
+import { Color } from 'vs/base/common/color';
 
 export class ActivitybarPart extends Part {
 
@@ -56,11 +60,13 @@ export class ActivitybarPart extends Part {
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPartService private partService: IPartService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@ILifecycleService private lifecycleService: ILifecycleService
 	) {
 		super(id, { hasTitle: false }, themeService);
 
 		this.globalActivityIdToActions = Object.create(null);
+
 		this.compositeBar = this.instantiationService.createInstance(CompositeBar, {
 			icon: true,
 			storageId: ActivitybarPart.PINNED_VIEWLETS,
@@ -75,6 +81,7 @@ export class ActivitybarPart extends Part {
 			colors: ActivitybarPart.COLORS,
 			overflowActionSize: ActivitybarPart.ACTION_HEIGHT
 		});
+
 		this.registerListeners();
 	}
 
@@ -128,6 +135,27 @@ export class ActivitybarPart extends Part {
 		// Top Actionbar with action items for each viewlet action
 		this.createGlobalActivityActionBar($('.global-activity').appendTo($result).getHTMLElement());
 
+		// TODO@Ben: workaround for https://github.com/Microsoft/vscode/issues/45700
+		// It looks like there are rendering glitches on macOS with Chrome 61 when
+		// using --webkit-mask with a background color that is different from the image
+		// The workaround is to promote the element onto its own drawing layer. We do
+		// this only after the workbench has loaded because otherwise there is ugly flicker.
+		if (isMacintosh) {
+			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
+				scheduleAtNextAnimationFrame(() => { // another delay...
+					scheduleAtNextAnimationFrame(() => { // ...to prevent more flickering on startup
+						registerThemingParticipant((theme, collector) => {
+							const activityBarForeground = theme.getColor(ACTIVITY_BAR_FOREGROUND);
+							if (activityBarForeground && !activityBarForeground.equals(Color.white)) {
+								// only apply this workaround if the color is different from the image one (white)
+								collector.addRule('.monaco-workbench .activitybar > .content > .composite-bar > .monaco-action-bar .action-label { will-change: transform; }');
+							}
+						});
+					});
+				});
+			});
+		}
+
 		return $result;
 	}
 
@@ -225,4 +253,4 @@ export class ActivitybarPart extends Part {
 
 		super.dispose();
 	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index 0c0b9b7c018..75f6dc4d7f6 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -28,7 +28,7 @@ process.lazyEnv = new Promise(function (resolve) {
 		assign(process.env, shellEnv);
 		resolve(process.env);
 	});
-	ipc.send('vscode:fetchShellEnv', remote.getCurrentWindow().id);
+	ipc.send('vscode:fetchShellEnv');
 });
 
 Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 21252971525..1995123083a 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -294,17 +294,17 @@ export class WorkbenchShell {
 		}
 
 		perf.mark('willReadLocalStorage');
-		const readyToSend = this.storageService.getBoolean('localStorageMetricsReadyToSend2');
+		const readyToSend = this.storageService.getBoolean('localStorageMetricsReadyToSend3');
 		perf.mark('didReadLocalStorage');
 
 		if (!readyToSend) {
-			this.storageService.store('localStorageMetricsReadyToSend2', true);
+			this.storageService.store('localStorageMetricsReadyToSend3', true);
 			return; // avoid logging localStorage metrics directly after the update, we prefer cold startup numbers
 		}
 
-		if (!this.storageService.getBoolean('localStorageMetricsSent2')) {
+		if (!this.storageService.getBoolean('localStorageMetricsSent3')) {
 			perf.mark('willWriteLocalStorage');
-			this.storageService.store('localStorageMetricsSent2', true);
+			this.storageService.store('localStorageMetricsSent3', true);
 			perf.mark('didWriteLocalStorage');
 
 			perf.mark('willStatLocalStorage');
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index 53402073fbf..5da959f79eb 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -131,7 +131,7 @@ export class ElectronWindow extends Themable {
 		});
 
 		// Support runAction event
-		ipc.on('vscode:runAction', (_event: any, request: IRunActionInWindowRequest) => {
+		ipc.on('vscode:runAction', (event: any, request: IRunActionInWindowRequest) => {
 			const args: any[] = [];
 
 			// If we run an action from the touchbar, we fill in the currently active resource
@@ -162,7 +162,7 @@ export class ElectronWindow extends Themable {
 		});
 
 		// Support resolve keybindings event
-		ipc.on('vscode:resolveKeybindings', (_event: any, rawActionIds: string) => {
+		ipc.on('vscode:resolveKeybindings', (event: any, rawActionIds: string) => {
 			let actionIds: string[] = [];
 			try {
 				actionIds = JSON.parse(rawActionIds);
@@ -178,7 +178,7 @@ export class ElectronWindow extends Themable {
 			}, () => errors.onUnexpectedError);
 		});
 
-		ipc.on('vscode:reportError', (_event: any, error: string) => {
+		ipc.on('vscode:reportError', (event: any, error: string) => {
 			if (error) {
 				const errorParsed = JSON.parse(error);
 				errorParsed.mainProcess = true;
@@ -187,13 +187,13 @@ export class ElectronWindow extends Themable {
 		});
 
 		// Support openFiles event for existing and new files
-		ipc.on('vscode:openFiles', (_event: any, request: IOpenFileRequest) => this.onOpenFiles(request));
+		ipc.on('vscode:openFiles', (event: any, request: IOpenFileRequest) => this.onOpenFiles(request));
 
 		// Support addFolders event if we have a workspace opened
-		ipc.on('vscode:addFolders', (_event: any, request: IAddFoldersRequest) => this.onAddFoldersRequest(request));
+		ipc.on('vscode:addFolders', (event: any, request: IAddFoldersRequest) => this.onAddFoldersRequest(request));
 
 		// Message support
-		ipc.on('vscode:showInfoMessage', (_event: any, message: string) => {
+		ipc.on('vscode:showInfoMessage', (event: any, message: string) => {
 			this.notificationService.info(message);
 		});
 
@@ -240,7 +240,7 @@ export class ElectronWindow extends Themable {
 		});
 
 		// keyboard layout changed event
-		ipc.on('vscode:accessibilitySupportChanged', (_event: any, accessibilitySupportEnabled: boolean) => {
+		ipc.on('vscode:accessibilitySupportChanged', (event: any, accessibilitySupportEnabled: boolean) => {
 			browser.setAccessibilitySupport(accessibilitySupportEnabled ? AccessibilitySupport.Enabled : AccessibilitySupport.Disabled);
 		});
 
diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 9a17c7976dc..e353d69e992 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -28,14 +28,14 @@ import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
 
 // const nativeExit = process.exit.bind(process);
 function patchProcess(allowExit: boolean) {
-	process.exit = function (code) {
+	process.exit = function (code?: number) {
 		if (allowExit) {
 			exit(code);
 		} else {
 			const err = new Error('An extension called process.exit() and this was prevented.');
 			console.warn(err.stack);
 		}
-	};
+	} as (code?: number) => never;
 
 	process.crash = function () {
 		const err = new Error('An extension called process.crash() and this was prevented.');
diff --git a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
index 05e315fc95b..d7c1b98eca9 100644
--- a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
+++ b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
@@ -55,12 +55,12 @@ export class NodeCachedDataManager implements IWorkbenchContribution {
 			}
 		*/
 		this._telemetryService.publicLog('cachedDataInfo', {
-			didRequestCachedData: Boolean(global.require.getConfig().nodeCachedDataDir),
+			didRequestCachedData: Boolean((<any>global).require.getConfig().nodeCachedDataDir),
 			didRejectCachedData,
 			didProduceCachedData
 		});
 
-		global.require.config({ onNodeCachedData: undefined });
+		(<any>global).require.config({ onNodeCachedData: undefined });
 		delete MonacoEnvironment.onNodeCachedData;
 	}
 }
diff --git a/src/vs/workbench/parts/debug/test/node/debugAdapter.test.ts b/src/vs/workbench/parts/debug/test/node/debugAdapter.test.ts
index fadc7c6c5fd..bc4cfc87f6c 100644
--- a/src/vs/workbench/parts/debug/test/node/debugAdapter.test.ts
+++ b/src/vs/workbench/parts/debug/test/node/debugAdapter.test.ts
@@ -136,6 +136,6 @@ suite('Debug - Adapter', () => {
 
 		return adapter.getInitialConfigurationContent().then(content => {
 			assert.equal(content, expected);
-		}, err => assert.fail());
+		}, err => assert.fail(err));
 	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/node/terminalProcess.ts b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
index 1bd5563acb0..008da19c4d6 100644
--- a/src/vs/workbench/parts/terminal/node/terminalProcess.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
@@ -24,7 +24,7 @@ var cols = process.env.PTYCOLS;
 var rows = process.env.PTYROWS;
 var currentTitle = '';
 
-setupPlanB(process.env.PTYPID);
+setupPlanB(Number(process.env.PTYPID));
 cleanEnv();
 
 interface IOptions {
@@ -91,9 +91,9 @@ process.on('message', function (message) {
 sendProcessId();
 setupTitlePolling();
 
-function getArgs() {
+function getArgs(): string[] {
 	if (process.env['PTYSHELLCMDLINE']) {
-		return process.env['PTYSHELLCMDLINE'];
+		return [process.env['PTYSHELLCMDLINE']];
 	}
 	var args = [];
 	var i = 0;
diff --git a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
index 5c323ca2409..6382148634b 100644
--- a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
+++ b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
@@ -18,6 +18,7 @@ import { unmnemonicLabel } from 'vs/base/common/labels';
 import { Event, Emitter } from 'vs/base/common/event';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IContextMenuDelegate, ContextSubMenu, IEvent } from 'vs/base/browser/contextmenu';
+import { once } from 'vs/base/common/functional';
 
 export class ContextMenuService implements IContextMenuService {
 
@@ -42,7 +43,15 @@ export class ContextMenuService implements IContextMenuService {
 			}
 
 			return TPromise.timeout(0).then(() => { // https://github.com/Microsoft/vscode/issues/3638
-				const menu = this.createMenu(delegate, actions);
+				const onHide = once(() => {
+					if (delegate.onHide) {
+						delegate.onHide(undefined);
+					}
+
+					this._onDidContextMenu.fire();
+				});
+
+				const menu = this.createMenu(delegate, actions, onHide);
 				const anchor = delegate.getAnchor();
 				let x: number, y: number;
 
@@ -61,16 +70,18 @@ export class ContextMenuService implements IContextMenuService {
 				x *= zoom;
 				y *= zoom;
 
-				menu.popup(remote.getCurrentWindow(), { x: Math.floor(x), y: Math.floor(y), positioningItem: delegate.autoSelectFirstItem ? 0 : void 0 });
-				this._onDidContextMenu.fire();
-				if (delegate.onHide) {
-					delegate.onHide(undefined);
-				}
+				menu.popup({
+					window: remote.getCurrentWindow(),
+					x: Math.floor(x),
+					y: Math.floor(y),
+					positioningItem: delegate.autoSelectFirstItem ? 0 : void 0,
+					callback: () => onHide()
+				});
 			});
 		});
 	}
 
-	private createMenu(delegate: IContextMenuDelegate, entries: (IAction | ContextSubMenu)[]): Electron.Menu {
+	private createMenu(delegate: IContextMenuDelegate, entries: (IAction | ContextSubMenu)[], onHide: () => void): Electron.Menu {
 		const menu = new remote.Menu();
 		const actionRunner = delegate.actionRunner || new ActionRunner();
 
@@ -79,7 +90,7 @@ export class ContextMenuService implements IContextMenuService {
 				menu.append(new remote.MenuItem({ type: 'separator' }));
 			} else if (e instanceof ContextSubMenu) {
 				const submenu = new remote.MenuItem({
-					submenu: this.createMenu(delegate, e.entries),
+					submenu: this.createMenu(delegate, e.entries, onHide),
 					label: unmnemonicLabel(e.label)
 				});
 
@@ -91,6 +102,13 @@ export class ContextMenuService implements IContextMenuService {
 					type: !!e.checked ? 'checkbox' : !!e.radio ? 'radio' : void 0,
 					enabled: !!e.enabled,
 					click: (menuItem, win, event) => {
+
+						// To preserve pre-electron-2.x behaviour, we first trigger
+						// the onHide callback and then the action.
+						// Fixes https://github.com/Microsoft/vscode/issues/45601
+						onHide();
+
+						// Run action which will close the menu
 						this.runAction(actionRunner, e, delegate, event);
 					}
 				};
diff --git a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
index 4778b3aa678..627c221fa6c 100644
--- a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
+++ b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
@@ -119,7 +119,7 @@ export class CrashReporterService implements ICrashReporterService {
 		// Experimental crash reporting support for child processes on Mac only for now
 		if (this.isEnabled && isMacintosh) {
 			const childProcessOptions = deepClone(this.options);
-			childProcessOptions.extra.processName = name;
+			(<any>childProcessOptions.extra).processName = name;
 			childProcessOptions.crashesDirectory = os.tmpdir();
 
 			return childProcessOptions;
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index f6caeb161b4..d91ed2b458c 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -193,13 +193,13 @@ export class ExtensionHostProcessWorker {
 				}, 100);
 
 				// Print out extension host output
-				onDebouncedOutput(data => {
-					const inspectorUrlIndex = !this._environmentService.isBuilt && data.data && data.data.indexOf('chrome-devtools://');
-					if (inspectorUrlIndex >= 0) {
-						console.log(`%c[Extension Host] %cdebugger inspector at ${data.data.substr(inspectorUrlIndex)}`, 'color: blue', 'color: black');
+				onDebouncedOutput(output => {
+					const inspectorUrlMatch = !this._environmentService.isBuilt && output.data && output.data.match(/ws:\/\/([^\s]+)/);
+					if (inspectorUrlMatch) {
+						console.log(`%c[Extension Host] %cdebugger inspector at chrome-devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${inspectorUrlMatch[1]}`, 'color: blue', 'color: black');
 					} else {
 						console.group('Extension Host');
-						console.log(data.data, ...data.format);
+						console.log(output.data, ...output.format);
 						console.groupEnd();
 					}
 				});
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
index 6b85c158939..5e73b6cbaeb 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -61,7 +61,7 @@ export class NsfwWatcherService implements IWatcherService {
 			ignored: request.ignored
 		};
 
-		process.on('uncaughtException', e => {
+		process.on('uncaughtException', (e: Error | string) => {
 
 			// Specially handle ENOSPC errors that can happen when
 			// the watcher consumes so many file descriptors that
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
index 57cb8d2bc06..8f2f0e3c850 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
@@ -29,7 +29,7 @@ const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.u
 export class RipgrepEngine {
 	private isDone = false;
 	private rgProc: cp.ChildProcess;
-	private killRgProcFn: Function;
+	private killRgProcFn: (code?: number) => void;
 	private postProcessExclusions: glob.ParsedExpression;
 
 	private ripgrepParser: RipgrepParser;
diff --git a/src/vs/workbench/services/search/test/node/searchService.test.ts b/src/vs/workbench/services/search/test/node/searchService.test.ts
index c687527d3b3..5d33088e881 100644
--- a/src/vs/workbench/services/search/test/node/searchService.test.ts
+++ b/src/vs/workbench/services/search/test/node/searchService.test.ts
@@ -109,7 +109,7 @@ suite('SearchService', () => {
 					assert.deepStrictEqual(value, match);
 					results++;
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 	});
@@ -131,7 +131,7 @@ suite('SearchService', () => {
 					});
 					results.push(value.length);
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 	});
@@ -218,7 +218,7 @@ suite('SearchService', () => {
 			if (Array.isArray(value)) {
 				results.push(...value.map(v => v.path));
 			} else {
-				assert.fail(value);
+				assert.fail(JSON.stringify(value));
 			}
 		});
 	});
@@ -245,7 +245,7 @@ suite('SearchService', () => {
 					});
 					results.push(value.length);
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 	});
@@ -275,7 +275,7 @@ suite('SearchService', () => {
 			if (Array.isArray(value)) {
 				results.push(...value.map(v => v.path));
 			} else {
-				assert.fail(value);
+				assert.fail(JSON.stringify(value));
 			}
 		}).then(() => {
 			const results = [];
@@ -291,7 +291,7 @@ suite('SearchService', () => {
 				if (Array.isArray(value)) {
 					results.push(...value.map(v => v.path));
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 		}).then(() => {
@@ -316,7 +316,7 @@ suite('SearchService', () => {
 				if (Array.isArray(value)) {
 					results.push(...value.map(v => v.path));
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 		});

From 515e2b59f5745528ccd0e1a0b24ce0cf7914ff46 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 3 Apr 2018 12:44:07 +0200
Subject: [PATCH 273/383] Fix #43813

---
 .../node/extensionManagementService.ts        | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index a938aa1e411..f13a2deb963 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -401,8 +401,10 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
+		const tempPath = path.join(this.extensionsPath, `.${id}`);
 		const extensionPath = path.join(this.extensionsPath, id);
-		return this.extract(id, zipPath, extensionPath)
+		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
+			.then(null, error => this.isWindowsEPERMError(error) ? this.extract(id, zipPath, extensionPath) : TPromise.wrapError(error))
 			.then(() => {
 				this.logService.info('Installation completed.', id);
 				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
@@ -416,6 +418,17 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
+	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string): TPromise<void> {
+		return this.extract(id, zipPath, extractPath)
+			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (5 * 1000) /* Retry for 5 seconds */)
+				.then(
+					() => this.logService.info('Renamed to', renamePath),
+					e => {
+						this.logService.info('Rename failed. Deleting from extracted location', extractPath);
+						return always(pfs.rimraf(extractPath), () => null).then(() => TPromise.wrapError(e));
+					}));
+	}
+
 	private extract(id: string, zipPath: string, extractPath: string): TPromise<void> {
 		this.logService.trace(`Started extracting the extension from ${zipPath} to ${extractPath}`);
 		return pfs.rimraf(extractPath)
@@ -431,12 +444,16 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private rename(id: string, extractPath: string, renamePath: string, retryUntil: number): TPromise<void> {
 		return pfs.rename(extractPath, renamePath)
 			.then(null, error =>
-				isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil
+				this.isWindowsEPERMError(error) && Date.now() < retryUntil
 					? this.rename(id, extractPath, renamePath, retryUntil)
 					: TPromise.wrapError(error)
 			);
 	}
 
+	private isWindowsEPERMError(error: any): boolean {
+		return isWindows && error && error.code === 'EPERM';
+	}
+
 	private rollback(extensions: IGalleryExtension[]): TPromise<void> {
 		return this.getInstalled(LocalExtensionType.User)
 			.then(installed =>

From f682b9b6d2af9691ec8c4523f9a44623d49eb4ac Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 12:53:28 +0200
Subject: [PATCH 274/383] zip - implement cancellation support for extractZip

---
 src/vs/base/node/zip.ts | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts
index 9ffea7f4620..ac9b5cdfd21 100644
--- a/src/vs/base/node/zip.ts
+++ b/src/vs/base/node/zip.ts
@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import * as path from 'path';
-import { createWriteStream } from 'fs';
+import { createWriteStream, WriteStream } from 'fs';
 import { Readable } from 'stream';
 import { nfcall, ninvoke, SimpleThrottler } from 'vs/base/common/async';
 import { mkdirp, rimraf } from 'vs/base/node/pfs';
@@ -74,23 +74,34 @@ function extractEntry(stream: Readable, fileName: string, mode: number, targetPa
 	const targetDirName = path.join(targetPath, dirName);
 	const targetFileName = path.join(targetPath, fileName);
 
+	let istream: WriteStream;
 	return mkdirp(targetDirName).then(() => new TPromise((c, e) => {
-		let istream = createWriteStream(targetFileName, { mode });
+		istream = createWriteStream(targetFileName, { mode });
 		istream.once('close', () => c(null));
 		istream.once('error', e);
 		stream.once('error', e);
 		stream.pipe(istream);
+	}, () => {
+		if (istream) {
+			istream.close();
+		}
 	}));
 }
 
 function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions): TPromise<void> {
+	let isCanceled = false;
+	let last = TPromise.wrap<any>(null);
+
 	return new TPromise((c, e) => {
 		const throttler = new SimpleThrottler();
-		let last = TPromise.as<any>(null);
 
 		zipfile.once('error', e);
 		zipfile.once('close', () => last.then(c, e));
 		zipfile.on('entry', (entry: Entry) => {
+			if (isCanceled) {
+				return;
+			}
+
 			if (!options.sourcePathRegex.test(entry.fileName)) {
 				return;
 			}
@@ -109,6 +120,10 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions): TP
 
 			last = throttler.queue(() => stream.then(stream => extractEntry(stream, fileName, mode, targetPath, options)));
 		});
+	}, () => {
+		isCanceled = true;
+		last.cancel();
+		zipfile.close();
 	}).then(null, err => TPromise.wrapError(toExtractError(err)));
 }
 

From 2e4bfdb24fd137a1d2e87bd480f283cf7001f19a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 12:54:57 +0200
Subject: [PATCH 275/383] Compare View loses scroll position when switching
 tabs (fixes #10663)

---
 .../browser/parts/editor/textDiffEditor.ts    | 152 ++++++++++++++----
 .../browser/parts/editor/textEditor.ts        |  45 +++---
 .../parts/editor/textResourceEditor.ts        |   2 +-
 3 files changed, 153 insertions(+), 46 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index d82743f7c8e..0046ce5ab25 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -32,10 +32,13 @@ import { IWorkbenchEditorService, DelegatingWorkbenchEditorService } from 'vs/wo
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ScrollType } from 'vs/editor/common/editorCommon';
+import { ScrollType, IDiffEditorViewState, IDiffEditorModel } from 'vs/editor/common/editorCommon';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
+import URI from 'vs/base/common/uri';
+import { getCodeOrDiffEditor } from 'vs/editor/browser/services/codeEditorService';
+import { once } from 'vs/base/common/event';
 
 /**
  * The text editor that leverages the diff text editor for the editing experience.
@@ -45,10 +48,10 @@ export class TextDiffEditor extends BaseTextEditor {
 	public static readonly ID = TEXT_DIFF_EDITOR_ID;
 
 	private diffNavigator: DiffNavigator;
+	private diffNavigatorDisposables: IDisposable[];
 	private nextDiffAction: NavigateAction;
 	private previousDiffAction: NavigateAction;
 	private toggleIgnoreTrimWhitespaceAction: ToggleIgnoreTrimWhitespaceAction;
-	private _configurationListener: IDisposable;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -63,11 +66,12 @@ export class TextDiffEditor extends BaseTextEditor {
 	) {
 		super(TextDiffEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorGroupService);
 
-		this._configurationListener = this._actualConfigurationService.onDidChangeConfiguration((e) => {
+		this.diffNavigatorDisposables = [];
+		this.toUnbind.push(this._actualConfigurationService.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration('diffEditor.ignoreTrimWhitespace')) {
 				this.updateIgnoreTrimWhitespaceAction();
 			}
-		});
+		}));
 	}
 
 	public getTitle(): string {
@@ -137,9 +141,10 @@ export class TextDiffEditor extends BaseTextEditor {
 		}
 
 		// Dispose previous diff navigator
-		if (this.diffNavigator) {
-			this.diffNavigator.dispose();
-		}
+		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
+
+		// Remember view settings if input changes
+		this.saveTextDiffEditorViewStateForInput(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options).then(() => {
@@ -155,27 +160,32 @@ export class TextDiffEditor extends BaseTextEditor {
 					return null;
 				}
 
-				// Editor
+				// Set Editor Model
 				const diffEditor = <IDiffEditor>this.getControl();
 				diffEditor.setModel((<TextDiffEditorModel>resolvedModel).textDiffEditorModel);
 
-				// Handle TextOptions
-				let alwaysRevealFirst = true;
+				// Apply Options from TextOptions
+				let optionsGotApplied = false;
 				if (options && types.isFunction((<TextEditorOptions>options).apply)) {
-					const hadOptions = (<TextEditorOptions>options).apply(<IDiffEditor>diffEditor, ScrollType.Immediate);
-					if (hadOptions) {
-						alwaysRevealFirst = false; // Do not reveal if we are instructed to open specific line/col
-					}
+					optionsGotApplied = (<TextEditorOptions>options).apply(<IDiffEditor>diffEditor, ScrollType.Immediate);
+				}
+
+				// Otherwise restore View State
+				let hasPreviousViewState = false;
+				if (!optionsGotApplied) {
+					hasPreviousViewState = this.restoreViewState(input);
 				}
 
-				// Listen on diff updated changes to reveal the first change
 				this.diffNavigator = new DiffNavigator(diffEditor, {
-					alwaysRevealFirst
+					alwaysRevealFirst: !optionsGotApplied && !hasPreviousViewState // only reveal first change if we had no options or viewstate
 				});
-				this.diffNavigator.onDidUpdate(() => {
+				this.diffNavigatorDisposables.push(this.diffNavigator);
+
+				this.diffNavigatorDisposables.push(this.diffNavigator.onDidUpdate(() => {
 					this.nextDiffAction.updateEnablement();
 					this.previousDiffAction.updateEnablement();
-				});
+				}));
+
 				this.updateIgnoreTrimWhitespaceAction();
 			}, error => {
 
@@ -190,6 +200,22 @@ export class TextDiffEditor extends BaseTextEditor {
 		});
 	}
 
+	private restoreViewState(input: EditorInput): boolean {
+		if (input instanceof DiffEditorInput) {
+			const resource = this.toDiffEditorViewStateResource(input);
+			if (resource) {
+				const viewState = this.loadTextEditorViewState(resource);
+				if (viewState) {
+					this.getControl().restoreViewState(viewState);
+
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	private updateIgnoreTrimWhitespaceAction(): void {
 		const ignoreTrimWhitespace = this.configurationService.getValue<boolean>(this.getResource(), 'diffEditor.ignoreTrimWhitespace');
 		if (this.toggleIgnoreTrimWhitespaceAction) {
@@ -278,9 +304,10 @@ export class TextDiffEditor extends BaseTextEditor {
 	public clearInput(): void {
 
 		// Dispose previous diff navigator
-		if (this.diffNavigator) {
-			this.diffNavigator.dispose();
-		}
+		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
+
+		// Keep editor view state in settings to restore when coming back
+		this.saveTextDiffEditorViewStateForInput(this.input);
 
 		// Clear Model
 		this.getControl().setModel(null);
@@ -305,14 +332,85 @@ export class TextDiffEditor extends BaseTextEditor {
 		return super.getControl() as IDiffEditor;
 	}
 
-	public dispose(): void {
+	protected loadTextEditorViewState(resource: URI): IDiffEditorViewState {
+		return super.loadTextEditorViewState(resource) as IDiffEditorViewState;  // overridden for text diff editor support
+	}
 
-		// Dispose previous diff navigator
-		if (this.diffNavigator) {
-			this.diffNavigator.dispose();
+	private saveTextDiffEditorViewStateForInput(input: EditorInput): void {
+		if (!(input instanceof DiffEditorInput)) {
+			return; // only supported for diff editor inputs
 		}
 
-		this._configurationListener.dispose();
+		const resource = this.toDiffEditorViewStateResource(input);
+		if (!resource) {
+			return; // unable to retrieve input resource
+		}
+
+		// Clear view state if input is disposed
+		if (input.isDisposed()) {
+			super.clearTextEditorViewState([resource]);
+		}
+
+		// Otherwise save it
+		else {
+			super.saveTextEditorViewState(resource);
+
+			// Make sure to clean up when the input gets disposed
+			once(input.onDispose)(() => {
+				super.clearTextEditorViewState([resource]);
+			});
+		}
+	}
+
+	protected retrieveTextEditorViewState(resource: URI): IDiffEditorViewState {
+		return this.retrieveTextDiffEditorViewState(resource); // overridden for text diff editor support
+	}
+
+	private retrieveTextDiffEditorViewState(resource: URI): IDiffEditorViewState {
+		const editor = getCodeOrDiffEditor(this).diffEditor;
+		if (!editor) {
+			return null; // not supported for non-diff editors
+		}
+
+		const model = editor.getModel();
+		if (!model || !model.modified || !model.original) {
+			return null; // view state always needs a model
+		}
+
+		const modelUri = this.toDiffEditorViewStateResource(model);
+		if (!modelUri) {
+			return null; // model URI is needed to make sure we save the view state correctly
+		}
+
+		if (modelUri.toString() !== resource.toString()) {
+			return null; // prevent saving view state for a model that is not the expected one
+		}
+
+		return editor.saveViewState();
+	}
+
+	private toDiffEditorViewStateResource(modelOrInput: IDiffEditorModel | DiffEditorInput): URI {
+		let original: URI;
+		let modified: URI;
+
+		if (modelOrInput instanceof DiffEditorInput) {
+			original = modelOrInput.originalInput.getResource();
+			modified = modelOrInput.modifiedInput.getResource();
+		} else {
+			original = modelOrInput.original.uri;
+			modified = modelOrInput.modified.uri;
+		}
+
+		if (!original || !modified) {
+			return null;
+		}
+
+		// create a URI that is the Base64 concatenation of original + modified resource
+		return URI.from({ scheme: 'diff', path: `${btoa(original.toString())}${btoa(modified.toString())}` });
+	}
+
+	public dispose(): void {
+		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index e1fb9987eb2..2a6c3da6744 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -233,23 +233,9 @@ export abstract class BaseTextEditor extends BaseEditor {
 	 * Saves the text editor view state for the given resource.
 	 */
 	protected saveTextEditorViewState(resource: URI): void {
-		const editor = getCodeOrDiffEditor(this).codeEditor;
-		if (!editor) {
-			return; // not supported for diff editors
-		}
-
-		const model = editor.getModel();
-		if (!model) {
-			return; // view state always needs a model
-		}
-
-		const modelUri = model.uri;
-		if (!modelUri) {
-			return; // model URI is needed to make sure we save the view state correctly
-		}
-
-		if (modelUri.toString() !== resource.toString()) {
-			return; // prevent saving view state for a model that is not the expected one
+		const editorViewState = this.retrieveTextEditorViewState(resource);
+		if (!editorViewState) {
+			return;
 		}
 
 		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
@@ -267,10 +253,33 @@ export abstract class BaseTextEditor extends BaseEditor {
 		}
 
 		if (typeof this.position === 'number') {
-			lastKnownViewState[this.position] = editor.saveViewState();
+			lastKnownViewState[this.position] = editorViewState;
 		}
 	}
 
+	protected retrieveTextEditorViewState(resource: URI): IEditorViewState {
+		const editor = getCodeOrDiffEditor(this).codeEditor;
+		if (!editor) {
+			return null; // not supported for diff editors
+		}
+
+		const model = editor.getModel();
+		if (!model) {
+			return null; // view state always needs a model
+		}
+
+		const modelUri = model.uri;
+		if (!modelUri) {
+			return null; // model URI is needed to make sure we save the view state correctly
+		}
+
+		if (modelUri.toString() !== resource.toString()) {
+			return null; // prevent saving view state for a model that is not the expected one
+		}
+
+		return editor.saveViewState();
+	}
+
 	/**
 	 * Clears the text editor view state for the given resources.
 	 */
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
index 71f1e85147b..4157d3019e0 100644
--- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -105,7 +105,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		});
 	}
 
-	protected restoreViewState(input: EditorInput) {
+	private restoreViewState(input: EditorInput) {
 		if (input instanceof UntitledEditorInput || input instanceof ResourceEditorInput) {
 			const viewState = this.loadTextEditorViewState(input.getResource());
 			if (viewState) {

From 9847315a4aa29daba00180e9a27b7d0e1b544463 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 14:13:16 +0200
Subject: [PATCH 276/383] Support UTF-16 w/o BOM (fixes #22564)

---
 src/vs/base/node/mime.ts                      |  91 +++++++++---------
 .../node/mime/fixtures/utf16_be_nobom.txt     | Bin 0 -> 60 bytes
 .../node/mime/fixtures/utf16_le_nobom.txt     | Bin 0 -> 60 bytes
 src/vs/base/test/node/mime/mime.test.ts       |  21 ++++
 4 files changed, 68 insertions(+), 44 deletions(-)
 create mode 100644 src/vs/base/test/node/mime/fixtures/utf16_be_nobom.txt
 create mode 100644 src/vs/base/test/node/mime/fixtures/utf16_le_nobom.txt

diff --git a/src/vs/base/node/mime.ts b/src/vs/base/node/mime.ts
index 1e38a4e02f3..3e02d22cd1a 100644
--- a/src/vs/base/node/mime.ts
+++ b/src/vs/base/node/mime.ts
@@ -11,48 +11,9 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as stream from 'vs/base/node/stream';
 import * as encoding from 'vs/base/node/encoding';
 
-/**
- * Lots of binary file types exists where the type can be determined by matching the first few bytes against some "magic patterns".
- * E.g. PDF files always start with %PDF- and the rest of the file contains mostly text, but sometimes binary data (for fonts and images).
- * In order to detect these types correctly (and independently from the file's extension), the content base mime type detection must be performed
- * on any file, not only on text files.
- *
- * Here is the original mime type detection in pseudocode:
- *
- * let mimes = [];
- *
- * read file extension
- *
- * if (file extension matches) {
- * 	if (file extension is bogus) {
- * 		// ignore.
- * 		// this covers *.manifest files which can contain arbitrary content, so the extension is of no value.
- * 		// a consequence of this is that the content based mime type becomes the most specific type in the array
- * 	} else {
- * 		mimes.push(associated mime type)	  // first element: most specific
- * 	}
- * }
- *
- * read file contents
- *
- * if (content based match found) {	// this is independent from text or binary
- * 	mimes.push(associated mime type)
- * 	if (a second mime exists for the match) {   // should be rare; text/plain should never be included here
- * 		// e.g. for svg: ['image/svg+xml', 'application/xml']
- * 		mimes.push(second mime)
- * 	}
- * }
- *
- * if (content == text)
- * 	mimes.push('text/plain')   // last element: least specific
- * else
- * 	mimes.push('application/octet-stream')    // last element: least specific
- */
-
 const ZERO_BYTE_DETECTION_BUFFER_MAX_LEN = 512; // number of bytes to look at to decide about a file being binary or not
-
-const NO_GUESS_BUFFER_MAX_LEN = 512; 		// when not auto guessing the encoding, small number of bytes are enough
-const AUTO_GUESS_BUFFER_MAX_LEN = 512 * 8; // with auto guessing we want a lot more content to be read for guessing
+const NO_GUESS_BUFFER_MAX_LEN = 512; 			// when not auto guessing the encoding, small number of bytes are enough
+const AUTO_GUESS_BUFFER_MAX_LEN = 512 * 8; 		// with auto guessing we want a lot more content to be read for guessing
 
 export function maxBufferLen(arg1?: DetectMimesOption | boolean): number {
 	let autoGuessEncoding: boolean;
@@ -77,19 +38,61 @@ export interface DetectMimesOption {
 export function detectMimeAndEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: false): IMimeAndEncoding;
 export function detectMimeAndEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IMimeAndEncoding>;
 export function detectMimeAndEncodingFromBuffer({ buffer, bytesRead }: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IMimeAndEncoding> | IMimeAndEncoding {
+
+	// Always first check for BOM to find out about encoding
 	let enc = encoding.detectEncodingByBOMFromBuffer(buffer, bytesRead);
 
-	// Detect 0 bytes to see if file is binary (ignore for UTF 16 though)
+	// Detect 0 bytes to see if file is binary or UTF-16 LE/BE
+	// unless we already know that this file has a UTF-16 encoding
 	let isText = true;
 	if (enc !== encoding.UTF16be && enc !== encoding.UTF16le) {
+		let couldBeUTF16LE = true; // e.g. 0xAA 0x00
+		let couldBeUTF16BE = true; // e.g. 0x00 0xAA
+		let containsZeroByte = false;
+
+		// This is a simplified guess to detect UTF-16 BE or LE by just checking if
+		// the first 512 bytes have the 0-byte at a specific location. For UTF-16 LE
+		// this would be the odd byte index and for UTF-16 BE the even one.
+		// Note: this can produce false positives (a binary file that uses a 2-byte
+		// encoding of the same format as UTF-16) and false negatives (a UTF-16 file
+		// that is using 4 bytes to encode a character).
 		for (let i = 0; i < bytesRead && i < ZERO_BYTE_DETECTION_BUFFER_MAX_LEN; i++) {
-			if (buffer.readInt8(i) === 0) {
-				isText = false;
+			const isEndian = (i % 2 === 1); // assume 2-byte sequences typical for UTF-16
+			const isZeroByte = (buffer.readInt8(i) === 0);
+
+			if (isZeroByte) {
+				containsZeroByte = true;
+			}
+
+			// UTF-16 LE: expect e.g. 0xAA 0x00
+			if (couldBeUTF16LE && (isEndian && !isZeroByte || !isEndian && isZeroByte)) {
+				couldBeUTF16LE = false;
+			}
+
+			// UTF-16 BE: expect e.g. 0x00 0xAA
+			if (couldBeUTF16BE && (isEndian && isZeroByte || !isEndian && !isZeroByte)) {
+				couldBeUTF16BE = false;
+			}
+
+			// Return if this is neither UTF16-LE nor UTF16-BE and thus treat as binary
+			if (isZeroByte && !couldBeUTF16LE && !couldBeUTF16BE) {
 				break;
 			}
 		}
+
+		// Handle case of 0-byte included
+		if (containsZeroByte) {
+			if (couldBeUTF16LE) {
+				enc = encoding.UTF16le;
+			} else if (couldBeUTF16BE) {
+				enc = encoding.UTF16be;
+			} else {
+				isText = false;
+			}
+		}
 	}
 
+	// Auto guess encoding if configured
 	if (autoGuessEncoding && isText && !enc) {
 		return encoding.guessEncodingByBuffer(buffer.slice(0, bytesRead)).then(enc => {
 			return {
diff --git a/src/vs/base/test/node/mime/fixtures/utf16_be_nobom.txt b/src/vs/base/test/node/mime/fixtures/utf16_be_nobom.txt
new file mode 100644
index 0000000000000000000000000000000000000000..63c29412093e3bd4d6b467adbf3ddc1b4608320f
GIT binary patch
literal 60
zcmZQ5VaQ;}WGH4(fRd#QB@Af{x(tR4W<aqdhEyO~4wM6_%Vz+|f<(VD<T7vp06L%w
A!T<mO

literal 0
HcmV?d00001

diff --git a/src/vs/base/test/node/mime/fixtures/utf16_le_nobom.txt b/src/vs/base/test/node/mime/fixtures/utf16_le_nobom.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7b94ff215b0c096f2a32e4226a991988a6da111e
GIT binary patch
literal 60
zcmXS6$Y981C}vQAlBEnK3~3Cy42BG5K(QQ#R3KRnlq&(M%Vz+|DljB5d}GLE;9>v(
DMvV&0

literal 0
HcmV?d00001

diff --git a/src/vs/base/test/node/mime/mime.test.ts b/src/vs/base/test/node/mime/mime.test.ts
index f99d59fb012..f0a383583c3 100644
--- a/src/vs/base/test/node/mime/mime.test.ts
+++ b/src/vs/base/test/node/mime/mime.test.ts
@@ -10,6 +10,7 @@ import * as assert from 'assert';
 import * as mimeCommon from 'vs/base/common/mime';
 import * as mime from 'vs/base/node/mime';
 import { readExactlyByFile } from 'vs/base/node/stream';
+import { UTF16le, UTF16be } from 'vs/base/node/encoding';
 
 suite('Mime', () => {
 
@@ -63,6 +64,26 @@ suite('Mime', () => {
 		});
 	});
 
+	test('detectMimesFromFile (guess UTF-16 LE from content without BOM)', function () {
+		mimeCommon.registerTextMime({ id: 'text', mime: 'text/plain', extension: '.txt' });
+		const file = require.toUrl('./fixtures/utf16_le_nobom.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
+			assert.equal(mimes.encoding, UTF16le);
+			assert.deepEqual(mimes.mimes, ['text/plain']);
+		});
+	});
+
+	test('detectMimesFromFile (guess UTF-16 BE from content without BOM)', function () {
+		mimeCommon.registerTextMime({ id: 'text', mime: 'text/plain', extension: '.txt' });
+		const file = require.toUrl('./fixtures/utf16_be_nobom.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
+			assert.equal(mimes.encoding, UTF16be);
+			assert.deepEqual(mimes.mimes, ['text/plain']);
+		});
+	});
+
 	test('autoGuessEncoding (ShiftJIS)', function () {
 		const file = require.toUrl('./fixtures/some.shiftjis.txt');
 		return readExactlyByFile(file, 512 * 8).then(buffer => {

From 46770993d06197f549c31abd68345d94c30425e2 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 14:15:56 +0200
Subject: [PATCH 277/383] Allow to open binary files in the text editor as
 explicit user gesture (fixes #1218)

---
 .../browser/parts/editor/binaryEditor.ts      | 42 +++++----
 .../parts/editor/media/resourceviewer.css     |  5 +-
 .../browser/parts/editor/resourceViewer.ts    | 94 +++++++++++++++----
 .../files/browser/editors/binaryFileEditor.ts | 35 ++++++-
 .../files/common/editors/fileEditorInput.ts   | 30 +++++-
 .../test/browser/fileEditorInput.test.ts      | 12 +++
 .../textfile/common/textFileEditorModel.ts    | 28 +++---
 .../common/textFileEditorModelManager.ts      | 15 ++-
 .../services/textfile/common/textfiles.ts     | 29 +++++-
 9 files changed, 224 insertions(+), 66 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 28e2795592b..8bf0f08c6b5 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -7,39 +7,48 @@
 
 import * as nls from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Dimension, Builder, $ } from 'vs/base/browser/builder';
-import { EditorModel, EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { ResourceViewerContext, ResourceViewer } from 'vs/workbench/browser/parts/editor/resourceViewer';
+import URI from 'vs/base/common/uri';
+
+export interface IOpenCallbacks {
+	openInternal: (input: EditorInput, options: EditorOptions) => void;
+	openExternal: (uri: URI) => void;
+}
 
 /*
  * This class is only intended to be subclassed and not instantiated.
  */
 export abstract class BaseBinaryResourceEditor extends BaseEditor {
-	private readonly _onMetadataChanged: Emitter<void>;
-	private metadata: string;
 
+	private readonly _onMetadataChanged: Emitter<void>;
+
+	private callbacks: IOpenCallbacks;
+	private metadata: string;
 	private binaryContainer: Builder;
 	private scrollbar: DomScrollableElement;
 	private resourceViewerContext: ResourceViewerContext;
 
 	constructor(
 		id: string,
+		callbacks: IOpenCallbacks,
 		telemetryService: ITelemetryService,
-		themeService: IThemeService,
-		private windowsService: IWindowsService
+		themeService: IThemeService
 	) {
 		super(id, telemetryService, themeService);
 
 		this._onMetadataChanged = new Emitter<void>();
+		this.toUnbind.push(this._onMetadataChanged);
+
+		this.callbacks = callbacks;
 	}
 
 	public get onMetadataChanged(): Event<void> {
@@ -74,10 +83,10 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 		// Otherwise set input and resolve
 		return super.setInput(input, options).then(() => {
-			return input.resolve(true).then((resolvedModel: EditorModel) => {
+			return input.resolve(true).then(model => {
 
 				// Assert Model instance
-				if (!(resolvedModel instanceof BinaryEditorModel)) {
+				if (!(model instanceof BinaryEditorModel)) {
 					return TPromise.wrapError<void>(new Error('Unable to open file as binary'));
 				}
 
@@ -87,21 +96,14 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 				}
 
 				// Render Input
-				const model = <BinaryEditorModel>resolvedModel;
 				this.resourceViewerContext = ResourceViewer.show(
 					{ name: model.getName(), resource: model.getResource(), size: model.getSize(), etag: model.getETag(), mime: model.getMime() },
 					this.binaryContainer,
 					this.scrollbar,
-					(resource: URI) => {
-						this.windowsService.openExternal(resource.toString()).then(didOpen => {
-							if (!didOpen) {
-								return this.windowsService.showItemInFolder(resource.fsPath);
-							}
-
-							return void 0;
-						});
-					},
-					(meta) => this.handleMetadataChanged(meta));
+					resource => this.callbacks.openInternal(input, options),
+					resource => this.callbacks.openExternal(resource),
+					meta => this.handleMetadataChanged(meta)
+				);
 
 				return TPromise.as<void>(null);
 			});
diff --git a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
index 6f4e21c6ef5..45eef21f8c3 100644
--- a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
+++ b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
@@ -54,8 +54,9 @@
 	cursor: zoom-out;
 }
 
-.monaco-resource-viewer .open-external,
-.monaco-resource-viewer .open-external:hover {
+.monaco-resource-viewer .embedded-link,
+.monaco-resource-viewer .embedded-link:hover {
 	cursor: pointer;
 	text-decoration: underline;
+	margin-left: 5px;
 }
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index 1d2ac46a693..ed753b69240 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -127,26 +127,42 @@ export interface ResourceViewerContext {
  * progress of the binary resource.
  */
 export class ResourceViewer {
+
+	private static readonly MAX_OPEN_INTERNAL_SIZE = BinarySize.MB * 200; // max size until we offer an action to open internally
+
 	public static show(
 		descriptor: IResourceDescriptor,
 		container: Builder,
 		scrollbar: DomScrollableElement,
-		openExternal: (uri: URI) => void,
+		openInternalClb: (uri: URI) => void,
+		openExternalClb: (uri: URI) => void,
 		metadataClb: (meta: string) => void
-	): ResourceViewerContext {
+	): ResourceViewerContext | null {
+
 		// Ensure CSS class
 		$(container).setClass('monaco-resource-viewer');
 
+		// Images
 		if (ResourceViewer.isImageResource(descriptor)) {
-			return ImageView.create(container, descriptor, scrollbar, openExternal, metadataClb);
+			return ImageView.create(container, descriptor, scrollbar, openExternalClb, metadataClb);
+		}
+
+		// Large Files
+		if (descriptor.size > ResourceViewer.MAX_OPEN_INTERNAL_SIZE) {
+			FileTooLargeFileView.create(container, descriptor, scrollbar, metadataClb);
+		}
+
+		// Seemingly Binary Files
+		else {
+			FileSeemsBinaryFileView.create(container, descriptor, scrollbar, openInternalClb, metadataClb);
 		}
 
-		GenericBinaryFileView.create(container, metadataClb, descriptor, scrollbar);
 		return null;
 	}
 
 	private static isImageResource(descriptor: IResourceDescriptor) {
 		const mime = ResourceViewer.getMime(descriptor);
+
 		return mime.indexOf('image/') >= 0;
 	}
 
@@ -158,6 +174,7 @@ export class ResourceViewer {
 				mime = mapExtToMediaMimes[ext.toLowerCase()];
 			}
 		}
+
 		return mime || mimes.MIME_BINARY;
 	}
 }
@@ -170,14 +187,15 @@ class ImageView {
 		container: Builder,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
-		openExternal: (uri: URI) => void,
+		openExternalClb: (uri: URI) => void,
 		metadataClb: (meta: string) => void
 	): ResourceViewerContext | null {
 		if (ImageView.shouldShowImageInline(descriptor)) {
 			return InlineImageView.create(container, descriptor, scrollbar, metadataClb);
 		}
 
-		LargeImageView.create(container, descriptor, openExternal);
+		LargeImageView.create(container, descriptor, openExternalClb);
+
 		return null;
 	}
 
@@ -205,41 +223,79 @@ class LargeImageView {
 	public static create(
 		container: Builder,
 		descriptor: IResourceDescriptor,
-		openExternal: (uri: URI) => void
+		openExternalClb: (uri: URI) => void
 	) {
+		const size = BinarySize.formatSize(descriptor.size);
+
 		const imageContainer = $(container)
 			.empty()
 			.p({
-				text: nls.localize('largeImageError', "The file size of the image is too large (>1MB) to display in the editor. ")
+				text: nls.localize('largeImageError', "The image is not displayed in the editor because it is too large ({0}).", size)
 			});
 
 		if (descriptor.resource.scheme !== Schemas.data) {
 			imageContainer.append($('a', {
 				role: 'button',
-				class: 'open-external',
+				class: 'embedded-link',
 				text: nls.localize('resourceOpenExternalButton', "Open image using external program?")
 			}).on(DOM.EventType.CLICK, (e) => {
-				openExternal(descriptor.resource);
+				openExternalClb(descriptor.resource);
 			}));
 		}
 	}
 }
 
-class GenericBinaryFileView {
+class FileTooLargeFileView {
 	public static create(
 		container: Builder,
-		metadataClb: (meta: string) => void,
 		descriptor: IResourceDescriptor,
-		scrollbar: DomScrollableElement
+		scrollbar: DomScrollableElement,
+		metadataClb: (meta: string) => void
 	) {
+		const size = BinarySize.formatSize(descriptor.size);
+
 		$(container)
 			.empty()
 			.span({
-				text: nls.localize('nativeBinaryError', "The file will not be displayed in the editor because it is either binary, very large or uses an unsupported text encoding.")
+				text: nls.localize('nativeFileTooLargeError', "The file is not displayed in the editor because it is too large ({0}).", size)
 			});
+
+		if (metadataClb) {
+			metadataClb(size);
+		}
+
+		scrollbar.scanDomNode();
+	}
+}
+
+class FileSeemsBinaryFileView {
+	public static create(
+		container: Builder,
+		descriptor: IResourceDescriptor,
+		scrollbar: DomScrollableElement,
+		openInternalClb: (uri: URI) => void,
+		metadataClb: (meta: string) => void
+	) {
+		const binaryContainer = $(container)
+			.empty()
+			.p({
+				text: nls.localize('nativeBinaryError', "The file is not displayed in the editor because it is either binary or uses an unsupported text encoding.")
+			});
+
+		if (descriptor.resource.scheme !== Schemas.data) {
+			binaryContainer.append($('a', {
+				role: 'button',
+				class: 'embedded-link',
+				text: nls.localize('openAsText', "Do you want to open it anyway?")
+			}).on(DOM.EventType.CLICK, (e) => {
+				openInternalClb(descriptor.resource);
+			}));
+		}
+
 		if (metadataClb) {
 			metadataClb(BinarySize.formatSize(descriptor.size));
 		}
+
 		scrollbar.scanDomNode();
 	}
 }
@@ -266,7 +322,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 
 	private onEditorsChanged(): void {
 		this.hide();
-		this.onSelectScale = undefined;
+		this.onSelectScale = void 0;
 	}
 
 	public show(scale: Scale, onSelectScale: (scale: number) => void) {
@@ -295,6 +351,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 				.getHTMLElement();
 			this.statusBarItem.style.display = 'none';
 		}
+
 		return this;
 	}
 
@@ -306,10 +363,11 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 	private get zoomActions(): Action[] {
 		const scales: Scale[] = [10, 5, 2, 1, 0.5, 0.2, 'fit'];
 		return scales.map(scale =>
-			new Action('zoom.' + scale, ZoomStatusbarItem.zoomLabel(scale), undefined, undefined, () => {
+			new Action(`zoom.${scale}`, ZoomStatusbarItem.zoomLabel(scale), void 0, void 0, () => {
 				if (this.onSelectScale) {
 					this.onSelectScale(scale);
 				}
+
 				return null;
 			}));
 	}
@@ -585,6 +643,4 @@ class InlineImageView {
 
 		return cached.src;
 	}
-}
-
-
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
index 346898902ab..4e9be064af3 100644
--- a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
@@ -10,6 +10,11 @@ import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
+import URI from 'vs/base/common/uri';
 
 /**
  * An implementation of editor for binary files like images.
@@ -21,9 +26,35 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
-		@IWindowsService windowsService: IWindowsService
+		@IWindowsService private windowsService: IWindowsService,
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService
 	) {
-		super(BinaryFileEditor.ID, telemetryService, themeService, windowsService);
+		super(
+			BinaryFileEditor.ID,
+			{
+				openInternal: (input, options) => this.openInternal(input, options),
+				openExternal: resource => this.openExternal(resource)
+			},
+			telemetryService,
+			themeService
+		);
+	}
+
+	private openInternal(input: EditorInput, options: EditorOptions): void {
+		if (input instanceof FileEditorInput) {
+			input.setForceOpenAsText();
+			this.editorService.openEditor(input, options, this.position).done(null, onUnexpectedError);
+		}
+	}
+
+	private openExternal(resource: URI): void {
+		this.windowsService.openExternal(resource.toString()).then(didOpen => {
+			if (!didOpen) {
+				return this.windowsService.showItemInFolder(resource.fsPath);
+			}
+
+			return void 0;
+		});
 	}
 
 	public getTitle(): string {
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index 5c353824875..df4fca39e40 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -30,7 +30,9 @@ import { IHashService } from 'vs/workbench/services/hash/common/hashService';
  * A file editor input is the input type for the file editor of file system resources.
  */
 export class FileEditorInput extends EditorInput implements IFileEditorInput {
+	private preferredEncoding: string;
 	private forceOpenAsBinary: boolean;
+	private forceOpenAsText: boolean;
 	private textModelReference: TPromise<IReference<ITextEditorModel>>;
 	private name: string;
 	private toUnbind: IDisposable[];
@@ -40,7 +42,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	 */
 	constructor(
 		private resource: URI,
-		private preferredEncoding: string,
+		preferredEncoding: string,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@ITextFileService private textFileService: ITextFileService,
@@ -52,6 +54,8 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 		this.toUnbind = [];
 
+		this.setPreferredEncoding(preferredEncoding);
+
 		this.registerListeners();
 	}
 
@@ -83,6 +87,10 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 	public setPreferredEncoding(encoding: string): void {
 		this.preferredEncoding = encoding;
+
+		if (encoding) {
+			this.forceOpenAsText = true; // encoding is a good hint to open the file as text
+		}
 	}
 
 	public getEncoding(): string {
@@ -107,8 +115,14 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
+	public setForceOpenAsText(): void {
+		this.forceOpenAsText = true;
+		this.forceOpenAsBinary = false;
+	}
+
 	public setForceOpenAsBinary(): void {
 		this.forceOpenAsBinary = true;
+		this.forceOpenAsText = false;
 	}
 
 	public getTypeId(): string {
@@ -234,11 +248,17 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 		// Resolve as binary
 		if (this.forceOpenAsBinary) {
-			return this.resolveAsBinary();
+			return this.doResolveAsBinary();
 		}
 
 		// Resolve as text
-		return this.textFileService.models.loadOrCreate(this.resource, { encoding: this.preferredEncoding, reload: refresh }).then(model => {
+		return this.doResolveAsText(refresh);
+	}
+
+	private doResolveAsText(reload?: boolean): TPromise<TextFileEditorModel | BinaryEditorModel> {
+
+		// Resolve as text
+		return this.textFileService.models.loadOrCreate(this.resource, { encoding: this.preferredEncoding, reload, allowBinary: this.forceOpenAsText }).then(model => {
 
 			// This is a bit ugly, because we first resolve the model and then resolve a model reference. the reason being that binary
 			// or very large files do not resolve to a text file model but should be opened as binary files without text. First calling into
@@ -253,7 +273,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 			// In case of an error that indicates that the file is binary or too large, just return with the binary editor model
 			if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_IS_BINARY || (<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
-				return this.resolveAsBinary();
+				return this.doResolveAsBinary();
 			}
 
 			// Bubble any other error up
@@ -261,7 +281,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		});
 	}
 
-	private resolveAsBinary(): TPromise<BinaryEditorModel> {
+	private doResolveAsBinary(): TPromise<BinaryEditorModel> {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
index cf5fde01cd2..0d34ce79868 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
@@ -174,6 +174,18 @@ suite('Files - FileEditorInput', () => {
 		});
 	});
 
+	test('resolve handles too large files', function () {
+		const input = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/updatefile.js'), void 0);
+
+		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_TOO_LARGE));
+
+		return input.resolve(true).then(resolved => {
+			assert.ok(resolved);
+
+			resolved.dispose();
+		});
+	});
+
 	test('disposes model when not open anymore', function () {
 		const resource = toResource(this, '/path/index.txt');
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 2dc9ec326c5..331d0e9dfb9 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -18,7 +18,7 @@ import * as types from 'vs/base/common/types';
 import { IMode } from 'vs/editor/common/modes';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorModel, ISaveOptions, ISaveErrorHandler, ISaveParticipant, StateChange, SaveReason, IRawTextContent } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorModel, ISaveOptions, ISaveErrorHandler, ISaveParticipant, StateChange, SaveReason, IRawTextContent, ILoadOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { EncodingMode } from 'vs/workbench/common/editor';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
@@ -243,7 +243,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		if (soft) {
 			loadPromise = TPromise.as(this);
 		} else {
-			loadPromise = this.load(true /* force */);
+			loadPromise = this.load({ forceReadFromDisk: true });
 		}
 
 		return loadPromise.then(() => {
@@ -259,7 +259,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	public load(force?: boolean /* bypass any caches and really go to disk */): TPromise<TextFileEditorModel> {
+	public load(options?: ILoadOptions): TPromise<TextFileEditorModel> {
 		diag('load() - enter', this.resource, new Date());
 
 		// It is very important to not reload the model when the model is dirty. We only want to reload the model from the disk
@@ -273,14 +273,14 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 		// Only for new models we support to load from backup
 		if (!this.textEditorModel && !this.createTextEditorModelPromise) {
-			return this.loadWithBackup(force);
+			return this.loadWithBackup(options);
 		}
 
 		// Otherwise load from file resource
-		return this.loadFromFile(force);
+		return this.loadFromFile(options);
 	}
 
-	private loadWithBackup(force: boolean): TPromise<TextFileEditorModel> {
+	private loadWithBackup(options?: ILoadOptions): TPromise<TextFileEditorModel> {
 		return this.backupFileService.loadBackupResource(this.resource).then(backup => {
 
 			// Make sure meanwhile someone else did not suceed or start loading
@@ -303,23 +303,25 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			}
 
 			// Otherwise load from file
-			return this.loadFromFile(force);
+			return this.loadFromFile(options);
 		});
 	}
 
-	private loadFromFile(force: boolean): TPromise<TextFileEditorModel> {
+	private loadFromFile(options?: ILoadOptions): TPromise<TextFileEditorModel> {
+		const forceReadFromDisk = options && options.forceReadFromDisk;
+		const allowBinary = this.isResolved() /* always allow if we resolved previously */ || (options && options.allowBinary);
 
 		// Decide on etag
 		let etag: string;
-		if (force) {
-			etag = void 0; // bypass cache if force loading is true
+		if (forceReadFromDisk) {
+			etag = void 0; // reset ETag if we enforce to read from disk
 		} else if (this.lastResolvedDiskStat) {
 			etag = this.lastResolvedDiskStat.etag; // otherwise respect etag to support caching
 		}
 
 		// Resolve Content
 		return this.textFileService
-			.resolveTextContent(this.resource, { acceptTextOnly: true, etag, encoding: this.preferredEncoding })
+			.resolveTextContent(this.resource, { acceptTextOnly: !allowBinary, etag, encoding: this.preferredEncoding })
 			.then(content => this.handleLoadSuccess(content), error => this.handleLoadError(error));
 	}
 
@@ -921,7 +923,9 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			this.updatePreferredEncoding(encoding);
 
 			// Load
-			this.load(true /* force because encoding has changed */).done(null, onUnexpectedError);
+			this.load({
+				forceReadFromDisk: true	// because encoding has changed
+			}).done(null, onUnexpectedError);
 		}
 	}
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index c617d2113f8..7b19b9d0a36 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange, IModelLoadOrCreateOptions } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange, IModelLoadOrCreateOptions, ILoadOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ResourceMap } from 'vs/base/common/map';
@@ -167,22 +167,27 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 			return pendingLoad;
 		}
 
+		let modelLoadOptions: ILoadOptions;
+		if (options && options.allowBinary) {
+			modelLoadOptions = { allowBinary: true };
+		}
+
 		let modelPromise: TPromise<ITextFileEditorModel>;
 
 		// Model exists
 		let model = this.get(resource);
 		if (model) {
-			if (!options || !options.reload) {
-				modelPromise = TPromise.as(model);
+			if (options && options.reload) {
+				modelPromise = model.load(modelLoadOptions);
 			} else {
-				modelPromise = model.load();
+				modelPromise = TPromise.as(model);
 			}
 		}
 
 		// Model does not exist
 		else {
 			model = this.instantiationService.createInstance(TextFileEditorModel, resource, options ? options.encoding : void 0);
-			modelPromise = model.load();
+			modelPromise = model.load(modelLoadOptions);
 
 			// Install state change listener
 			this.mapResourceToStateChangeListener.set(resource, model.onDidStateChange(state => {
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index cacab86e342..94d8b44b598 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -140,8 +140,22 @@ export interface IRawTextContent extends IBaseStat {
 }
 
 export interface IModelLoadOrCreateOptions {
+
+
+	/**
+	 * The encoding to use when resolving the model text content.
+	 */
 	encoding?: string;
+
+	/**
+	 * Wether to reload the model if it already exists.
+	 */
 	reload?: boolean;
+
+	/**
+	 * Allow to load a model even if we think it is a binary file.
+	 */
+	allowBinary?: boolean;
 }
 
 export interface ITextFileEditorModelManager {
@@ -179,6 +193,19 @@ export interface ISaveOptions {
 	writeElevated?: boolean;
 }
 
+export interface ILoadOptions {
+
+	/**
+	 * Go to disk bypassing any cache of the model if any.
+	 */
+	forceReadFromDisk?: boolean;
+
+	/**
+	 * Allow to load a model even if we think it is a binary file.
+	 */
+	allowBinary?: boolean;
+}
+
 export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport {
 
 	onDidContentChange: Event<StateChange>;
@@ -196,7 +223,7 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 
 	save(options?: ISaveOptions): TPromise<void>;
 
-	load(): TPromise<ITextFileEditorModel>;
+	load(options?: ILoadOptions): TPromise<ITextFileEditorModel>;
 
 	revert(soft?: boolean): TPromise<void>;
 

From 351221b11d399bd5761b9ceec62a2ea4f869aa26 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 3 Apr 2018 14:18:42 +0200
Subject: [PATCH 278/383] Marketplace category "Languages" changed to
 "Programming Languages". For #47103

---
 .../workbench/services/extensions/common/extensionsRegistry.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index cabacc9d019..92ca673dc8b 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -148,7 +148,7 @@ const schema: IJSONSchema = {
 			uniqueItems: true,
 			items: {
 				type: 'string',
-				enum: ['Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure', 'Language Packs']
+				enum: ['Programming Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure', 'Language Packs']
 			}
 		},
 		galleryBanner: {

From f3b860d400f0dd5d056fef4d936856a2222e0993 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 14:23:24 +0200
Subject: [PATCH 279/383] debt - merge node/mime.ts into node/encoding.ts

---
 src/vs/base/node/encoding.ts                  |  96 ++++++++++++++-
 src/vs/base/node/mime.ts                      | 109 ------------------
 .../base/test/node/encoding/encoding.test.ts  |  86 ++++++++++++++
 .../fixtures/some.cp1252.txt                  |   0
 .../fixtures/some.css.qwoff                   |   0
 .../{mime => encoding}/fixtures/some.json.png |   0
 .../node/{mime => encoding}/fixtures/some.pdf | Bin
 .../{mime => encoding}/fixtures/some.png.txt  | Bin
 .../fixtures/some.qwoff.txt                   | Bin
 .../fixtures/some.shiftjis.txt                |   0
 .../{mime => encoding}/fixtures/some.xml.png  |   0
 .../fixtures/utf16_be_nobom.txt               | Bin
 .../fixtures/utf16_le_nobom.txt               | Bin
 src/vs/base/test/node/mime/mime.test.ts       | 104 -----------------
 .../electron-browser/remoteFileService.ts     |  11 +-
 .../services/files/node/fileService.ts        |  12 +-
 .../search/node/worker/searchWorker.ts        |  10 +-
 17 files changed, 194 insertions(+), 234 deletions(-)
 delete mode 100644 src/vs/base/node/mime.ts
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.cp1252.txt (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.css.qwoff (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.json.png (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.pdf (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.png.txt (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.qwoff.txt (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.shiftjis.txt (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/some.xml.png (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/utf16_be_nobom.txt (100%)
 rename src/vs/base/test/node/{mime => encoding}/fixtures/utf16_le_nobom.txt (100%)
 delete mode 100644 src/vs/base/test/node/mime/mime.test.ts

diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts
index a84cec1f952..e861c4048cb 100644
--- a/src/vs/base/node/encoding.ts
+++ b/src/vs/base/node/encoding.ts
@@ -172,6 +172,100 @@ export function toCanonicalName(enc: string): string {
 	}
 }
 
+const ZERO_BYTE_DETECTION_BUFFER_MAX_LEN = 512; // number of bytes to look at to decide about a file being binary or not
+const NO_GUESS_BUFFER_MAX_LEN = 512; 			// when not auto guessing the encoding, small number of bytes are enough
+const AUTO_GUESS_BUFFER_MAX_LEN = 512 * 8; 		// with auto guessing we want a lot more content to be read for guessing
+
+export function maxEncodingDetectionBufferLen(arg1?: DetectEncodingOption | boolean): number {
+	let autoGuessEncoding: boolean;
+	if (typeof arg1 === 'boolean') {
+		autoGuessEncoding = arg1;
+	} else {
+		autoGuessEncoding = arg1 && arg1.autoGuessEncoding;
+	}
+
+	return autoGuessEncoding ? AUTO_GUESS_BUFFER_MAX_LEN : NO_GUESS_BUFFER_MAX_LEN;
+}
+
+export interface IDetectedEncodingResult {
+	encoding: string;
+	seemsBinary: boolean;
+}
+
+export interface DetectEncodingOption {
+	autoGuessEncoding?: boolean;
+}
+
+export function detectEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: false): IDetectedEncodingResult;
+export function detectEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IDetectedEncodingResult>;
+export function detectEncodingFromBuffer({ buffer, bytesRead }: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IDetectedEncodingResult> | IDetectedEncodingResult {
+
+	// Always first check for BOM to find out about encoding
+	let encoding = detectEncodingByBOMFromBuffer(buffer, bytesRead);
+
+	// Detect 0 bytes to see if file is binary or UTF-16 LE/BE
+	// unless we already know that this file has a UTF-16 encoding
+	let seemsBinary = false;
+	if (encoding !== UTF16be && encoding !== UTF16le) {
+		let couldBeUTF16LE = true; // e.g. 0xAA 0x00
+		let couldBeUTF16BE = true; // e.g. 0x00 0xAA
+		let containsZeroByte = false;
+
+		// This is a simplified guess to detect UTF-16 BE or LE by just checking if
+		// the first 512 bytes have the 0-byte at a specific location. For UTF-16 LE
+		// this would be the odd byte index and for UTF-16 BE the even one.
+		// Note: this can produce false positives (a binary file that uses a 2-byte
+		// encoding of the same format as UTF-16) and false negatives (a UTF-16 file
+		// that is using 4 bytes to encode a character).
+		for (let i = 0; i < bytesRead && i < ZERO_BYTE_DETECTION_BUFFER_MAX_LEN; i++) {
+			const isEndian = (i % 2 === 1); // assume 2-byte sequences typical for UTF-16
+			const isZeroByte = (buffer.readInt8(i) === 0);
+
+			if (isZeroByte) {
+				containsZeroByte = true;
+			}
+
+			// UTF-16 LE: expect e.g. 0xAA 0x00
+			if (couldBeUTF16LE && (isEndian && !isZeroByte || !isEndian && isZeroByte)) {
+				couldBeUTF16LE = false;
+			}
+
+			// UTF-16 BE: expect e.g. 0x00 0xAA
+			if (couldBeUTF16BE && (isEndian && isZeroByte || !isEndian && !isZeroByte)) {
+				couldBeUTF16BE = false;
+			}
+
+			// Return if this is neither UTF16-LE nor UTF16-BE and thus treat as binary
+			if (isZeroByte && !couldBeUTF16LE && !couldBeUTF16BE) {
+				break;
+			}
+		}
+
+		// Handle case of 0-byte included
+		if (containsZeroByte) {
+			if (couldBeUTF16LE) {
+				encoding = UTF16le;
+			} else if (couldBeUTF16BE) {
+				encoding = UTF16be;
+			} else {
+				seemsBinary = true;
+			}
+		}
+	}
+
+	// Auto guess encoding if configured
+	if (autoGuessEncoding && !seemsBinary && !encoding) {
+		return guessEncodingByBuffer(buffer.slice(0, bytesRead)).then(encoding => {
+			return {
+				seemsBinary: false,
+				encoding
+			};
+		});
+	}
+
+	return { seemsBinary, encoding };
+}
+
 // https://ss64.com/nt/chcp.html
 const windowsTerminalEncodings = {
 	'437': 'cp437', // United States
@@ -256,4 +350,4 @@ export function resolveTerminalEncoding(verbose?: boolean): TPromise<string> {
 
 		return UTF8;
 	});
-}
+}
\ No newline at end of file
diff --git a/src/vs/base/node/mime.ts b/src/vs/base/node/mime.ts
deleted file mode 100644
index 3e02d22cd1a..00000000000
--- a/src/vs/base/node/mime.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as mime from 'vs/base/common/mime';
-import { TPromise } from 'vs/base/common/winjs.base';
-
-import * as stream from 'vs/base/node/stream';
-import * as encoding from 'vs/base/node/encoding';
-
-const ZERO_BYTE_DETECTION_BUFFER_MAX_LEN = 512; // number of bytes to look at to decide about a file being binary or not
-const NO_GUESS_BUFFER_MAX_LEN = 512; 			// when not auto guessing the encoding, small number of bytes are enough
-const AUTO_GUESS_BUFFER_MAX_LEN = 512 * 8; 		// with auto guessing we want a lot more content to be read for guessing
-
-export function maxBufferLen(arg1?: DetectMimesOption | boolean): number {
-	let autoGuessEncoding: boolean;
-	if (typeof arg1 === 'boolean') {
-		autoGuessEncoding = arg1;
-	} else {
-		autoGuessEncoding = arg1 && arg1.autoGuessEncoding;
-	}
-
-	return autoGuessEncoding ? AUTO_GUESS_BUFFER_MAX_LEN : NO_GUESS_BUFFER_MAX_LEN;
-}
-
-export interface IMimeAndEncoding {
-	encoding: string;
-	mimes: string[];
-}
-
-export interface DetectMimesOption {
-	autoGuessEncoding?: boolean;
-}
-
-export function detectMimeAndEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: false): IMimeAndEncoding;
-export function detectMimeAndEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IMimeAndEncoding>;
-export function detectMimeAndEncodingFromBuffer({ buffer, bytesRead }: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IMimeAndEncoding> | IMimeAndEncoding {
-
-	// Always first check for BOM to find out about encoding
-	let enc = encoding.detectEncodingByBOMFromBuffer(buffer, bytesRead);
-
-	// Detect 0 bytes to see if file is binary or UTF-16 LE/BE
-	// unless we already know that this file has a UTF-16 encoding
-	let isText = true;
-	if (enc !== encoding.UTF16be && enc !== encoding.UTF16le) {
-		let couldBeUTF16LE = true; // e.g. 0xAA 0x00
-		let couldBeUTF16BE = true; // e.g. 0x00 0xAA
-		let containsZeroByte = false;
-
-		// This is a simplified guess to detect UTF-16 BE or LE by just checking if
-		// the first 512 bytes have the 0-byte at a specific location. For UTF-16 LE
-		// this would be the odd byte index and for UTF-16 BE the even one.
-		// Note: this can produce false positives (a binary file that uses a 2-byte
-		// encoding of the same format as UTF-16) and false negatives (a UTF-16 file
-		// that is using 4 bytes to encode a character).
-		for (let i = 0; i < bytesRead && i < ZERO_BYTE_DETECTION_BUFFER_MAX_LEN; i++) {
-			const isEndian = (i % 2 === 1); // assume 2-byte sequences typical for UTF-16
-			const isZeroByte = (buffer.readInt8(i) === 0);
-
-			if (isZeroByte) {
-				containsZeroByte = true;
-			}
-
-			// UTF-16 LE: expect e.g. 0xAA 0x00
-			if (couldBeUTF16LE && (isEndian && !isZeroByte || !isEndian && isZeroByte)) {
-				couldBeUTF16LE = false;
-			}
-
-			// UTF-16 BE: expect e.g. 0x00 0xAA
-			if (couldBeUTF16BE && (isEndian && isZeroByte || !isEndian && !isZeroByte)) {
-				couldBeUTF16BE = false;
-			}
-
-			// Return if this is neither UTF16-LE nor UTF16-BE and thus treat as binary
-			if (isZeroByte && !couldBeUTF16LE && !couldBeUTF16BE) {
-				break;
-			}
-		}
-
-		// Handle case of 0-byte included
-		if (containsZeroByte) {
-			if (couldBeUTF16LE) {
-				enc = encoding.UTF16le;
-			} else if (couldBeUTF16BE) {
-				enc = encoding.UTF16be;
-			} else {
-				isText = false;
-			}
-		}
-	}
-
-	// Auto guess encoding if configured
-	if (autoGuessEncoding && isText && !enc) {
-		return encoding.guessEncodingByBuffer(buffer.slice(0, bytesRead)).then(enc => {
-			return {
-				mimes: isText ? [mime.MIME_TEXT] : [mime.MIME_BINARY],
-				encoding: enc
-			};
-		});
-	}
-
-	return {
-		mimes: isText ? [mime.MIME_TEXT] : [mime.MIME_BINARY],
-		encoding: enc
-	};
-}
\ No newline at end of file
diff --git a/src/vs/base/test/node/encoding/encoding.test.ts b/src/vs/base/test/node/encoding/encoding.test.ts
index d5fc48bf381..7ade8bf5873 100644
--- a/src/vs/base/test/node/encoding/encoding.test.ts
+++ b/src/vs/base/test/node/encoding/encoding.test.ts
@@ -8,6 +8,7 @@
 import * as assert from 'assert';
 
 import * as encoding from 'vs/base/node/encoding';
+import { readExactlyByFile } from 'vs/base/node/stream';
 
 suite('Encoding', () => {
 	test('detectBOM UTF-8', () => {
@@ -64,4 +65,89 @@ suite('Encoding', () => {
 			assert.equal(enc, 'utf16le');
 		});
 	});
+
+	test('detectEncodingFromBuffer (JSON saved as PNG)', function () {
+		const file = require.toUrl('./fixtures/some.json.png');
+
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (PNG saved as TXT)', function () {
+		const file = require.toUrl('./fixtures/some.png.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, true);
+		});
+	});
+
+	test('detectEncodingFromBuffer (XML saved as PNG)', function () {
+		const file = require.toUrl('./fixtures/some.xml.png');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (QWOFF saved as TXT)', function () {
+		const file = require.toUrl('./fixtures/some.qwoff.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, true);
+		});
+	});
+
+	test('detectEncodingFromBuffer (CSS saved as QWOFF)', function () {
+		const file = require.toUrl('./fixtures/some.css.qwoff');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (PDF)', function () {
+		const file = require.toUrl('./fixtures/some.pdf');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, true);
+		});
+	});
+
+	test('detectEncodingFromBuffer (guess UTF-16 LE from content without BOM)', function () {
+		const file = require.toUrl('./fixtures/utf16_le_nobom.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.encoding, encoding.UTF16le);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (guess UTF-16 BE from content without BOM)', function () {
+		const file = require.toUrl('./fixtures/utf16_be_nobom.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.encoding, encoding.UTF16be);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('autoGuessEncoding (ShiftJIS)', function () {
+		const file = require.toUrl('./fixtures/some.shiftjis.txt');
+		return readExactlyByFile(file, 512 * 8).then(buffer => {
+			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
+				assert.equal(mimes.encoding, 'shiftjis');
+			});
+		});
+	});
+
+	test('autoGuessEncoding (CP1252)', function () {
+		const file = require.toUrl('./fixtures/some.cp1252.txt');
+		return readExactlyByFile(file, 512 * 8).then(buffer => {
+			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
+				assert.equal(mimes.encoding, 'windows1252');
+			});
+		});
+	});
 });
diff --git a/src/vs/base/test/node/mime/fixtures/some.cp1252.txt b/src/vs/base/test/node/encoding/fixtures/some.cp1252.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.cp1252.txt
rename to src/vs/base/test/node/encoding/fixtures/some.cp1252.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.css.qwoff b/src/vs/base/test/node/encoding/fixtures/some.css.qwoff
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.css.qwoff
rename to src/vs/base/test/node/encoding/fixtures/some.css.qwoff
diff --git a/src/vs/base/test/node/mime/fixtures/some.json.png b/src/vs/base/test/node/encoding/fixtures/some.json.png
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.json.png
rename to src/vs/base/test/node/encoding/fixtures/some.json.png
diff --git a/src/vs/base/test/node/mime/fixtures/some.pdf b/src/vs/base/test/node/encoding/fixtures/some.pdf
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.pdf
rename to src/vs/base/test/node/encoding/fixtures/some.pdf
diff --git a/src/vs/base/test/node/mime/fixtures/some.png.txt b/src/vs/base/test/node/encoding/fixtures/some.png.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.png.txt
rename to src/vs/base/test/node/encoding/fixtures/some.png.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.qwoff.txt b/src/vs/base/test/node/encoding/fixtures/some.qwoff.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.qwoff.txt
rename to src/vs/base/test/node/encoding/fixtures/some.qwoff.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.shiftjis.txt b/src/vs/base/test/node/encoding/fixtures/some.shiftjis.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.shiftjis.txt
rename to src/vs/base/test/node/encoding/fixtures/some.shiftjis.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.xml.png b/src/vs/base/test/node/encoding/fixtures/some.xml.png
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.xml.png
rename to src/vs/base/test/node/encoding/fixtures/some.xml.png
diff --git a/src/vs/base/test/node/mime/fixtures/utf16_be_nobom.txt b/src/vs/base/test/node/encoding/fixtures/utf16_be_nobom.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/utf16_be_nobom.txt
rename to src/vs/base/test/node/encoding/fixtures/utf16_be_nobom.txt
diff --git a/src/vs/base/test/node/mime/fixtures/utf16_le_nobom.txt b/src/vs/base/test/node/encoding/fixtures/utf16_le_nobom.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/utf16_le_nobom.txt
rename to src/vs/base/test/node/encoding/fixtures/utf16_le_nobom.txt
diff --git a/src/vs/base/test/node/mime/mime.test.ts b/src/vs/base/test/node/mime/mime.test.ts
deleted file mode 100644
index f0a383583c3..00000000000
--- a/src/vs/base/test/node/mime/mime.test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-
-import * as mimeCommon from 'vs/base/common/mime';
-import * as mime from 'vs/base/node/mime';
-import { readExactlyByFile } from 'vs/base/node/stream';
-import { UTF16le, UTF16be } from 'vs/base/node/encoding';
-
-suite('Mime', () => {
-
-	test('detectMimesFromFile (JSON saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.json.png');
-
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('detectMimesFromFile (PNG saved as TXT)', function () {
-		mimeCommon.registerTextMime({ id: 'text', mime: 'text/plain', extension: '.txt' });
-		const file = require.toUrl('./fixtures/some.png.txt');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['application/octet-stream']);
-		});
-	});
-
-	test('detectMimesFromFile (XML saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.xml.png');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('detectMimesFromFile (QWOFF saved as TXT)', function () {
-		const file = require.toUrl('./fixtures/some.qwoff.txt');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['application/octet-stream']);
-		});
-	});
-
-	test('detectMimesFromFile (CSS saved as QWOFF)', function () {
-		const file = require.toUrl('./fixtures/some.css.qwoff');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('detectMimesFromFile (PDF)', function () {
-		const file = require.toUrl('./fixtures/some.pdf');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['application/octet-stream']);
-		});
-	});
-
-	test('detectMimesFromFile (guess UTF-16 LE from content without BOM)', function () {
-		mimeCommon.registerTextMime({ id: 'text', mime: 'text/plain', extension: '.txt' });
-		const file = require.toUrl('./fixtures/utf16_le_nobom.txt');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.equal(mimes.encoding, UTF16le);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('detectMimesFromFile (guess UTF-16 BE from content without BOM)', function () {
-		mimeCommon.registerTextMime({ id: 'text', mime: 'text/plain', extension: '.txt' });
-		const file = require.toUrl('./fixtures/utf16_be_nobom.txt');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.equal(mimes.encoding, UTF16be);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('autoGuessEncoding (ShiftJIS)', function () {
-		const file = require.toUrl('./fixtures/some.shiftjis.txt');
-		return readExactlyByFile(file, 512 * 8).then(buffer => {
-			return mime.detectMimeAndEncodingFromBuffer(buffer, true).then(mimes => {
-				assert.equal(mimes.encoding, 'shiftjis');
-			});
-		});
-	});
-
-	test('autoGuessEncoding (CP1252)', function () {
-		const file = require.toUrl('./fixtures/some.cp1252.txt');
-		return readExactlyByFile(file, 512 * 8).then(buffer => {
-			return mime.detectMimeAndEncodingFromBuffer(buffer, true).then(mimes => {
-				assert.equal(mimes.encoding, 'windows1252');
-			});
-		});
-	});
-});
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index 3f7fbe5d3f8..8ea31395c81 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -13,7 +13,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { isFalsyOrEmpty, distinct } from 'vs/base/common/arrays';
 import { Schemas } from 'vs/base/common/network';
 import { Progress } from 'vs/platform/progress/common/progress';
-import { decodeStream, encode, UTF8, UTF8_with_bom } from 'vs/base/node/encoding';
+import { decodeStream, encode, UTF8, UTF8_with_bom, detectEncodingFromBuffer, maxEncodingDetectionBufferLen } from 'vs/base/node/encoding';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -22,8 +22,6 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { maxBufferLen, detectMimeAndEncodingFromBuffer } from 'vs/base/node/mime';
-import { MIME_BINARY } from 'vs/base/common/mime';
 import { localize } from 'vs/nls';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
@@ -250,7 +248,7 @@ export class RemoteFileService extends FileService {
 				}
 
 				const guessEncoding = options.autoGuessEncoding;
-				const count = maxBufferLen(options);
+				const count = maxEncodingDetectionBufferLen(options);
 				const chunks: Buffer[] = [];
 
 				return provider.read(
@@ -258,11 +256,10 @@ export class RemoteFileService extends FileService {
 					0, count,
 					new Progress<Buffer>(chunk => chunks.push(chunk))
 				).then(bytesRead => {
-					// send to bla
-					return detectMimeAndEncodingFromBuffer({ bytesRead, buffer: Buffer.concat(chunks) }, guessEncoding);
+					return detectEncodingFromBuffer({ bytesRead, buffer: Buffer.concat(chunks) }, guessEncoding);
 
 				}).then(detected => {
-					if (options.acceptTextOnly && detected.mimes.indexOf(MIME_BINARY) >= 0) {
+					if (options.acceptTextOnly && detected.seemsBinary) {
 						return TPromise.wrapError<IStreamContent>(new FileOperationError(
 							localize('fileBinaryError', "File seems to be binary and cannot be opened as text"),
 							FileOperationResult.FILE_IS_BINARY,
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
index d0e3b80b305..44c7cba907a 100644
--- a/src/vs/workbench/services/files/node/fileService.ts
+++ b/src/vs/workbench/services/files/node/fileService.ts
@@ -15,7 +15,6 @@ import { MAX_FILE_SIZE, MAX_HEAP_SIZE } from 'vs/platform/files/node/files';
 import { isEqualOrParent } from 'vs/base/common/paths';
 import { ResourceMap } from 'vs/base/common/map';
 import * as arrays from 'vs/base/common/arrays';
-import * as baseMime from 'vs/base/common/mime';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as objects from 'vs/base/common/objects';
 import * as extfs from 'vs/base/node/extfs';
@@ -27,7 +26,6 @@ import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import * as pfs from 'vs/base/node/pfs';
 import * as encoding from 'vs/base/node/encoding';
-import { detectMimeAndEncodingFromBuffer, IMimeAndEncoding } from 'vs/base/node/mime';
 import * as flow from 'vs/base/node/flow';
 import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcherService';
 import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files/node/watcher/win32/watcherService';
@@ -492,12 +490,12 @@ export class FileService implements IFileService {
 						} else {
 							// when receiving the first chunk of data we need to create the
 							// decoding stream which is then used to drive the string stream.
-							TPromise.as(detectMimeAndEncodingFromBuffer(
+							TPromise.as(encoding.detectEncodingFromBuffer(
 								{ buffer: chunkBuffer, bytesRead },
 								options && options.autoGuessEncoding || this.configuredAutoGuessEncoding(resource)
-							)).then(value => {
+							)).then(detected => {
 
-								if (options && options.acceptTextOnly && value.mimes.indexOf(baseMime.MIME_BINARY) >= 0) {
+								if (options && options.acceptTextOnly && detected.seemsBinary) {
 									// Return error early if client only accepts text and this is not text
 									finish(new FileOperationError(
 										nls.localize('fileBinaryError', "File seems to be binary and cannot be opened as text"),
@@ -506,7 +504,7 @@ export class FileService implements IFileService {
 									));
 
 								} else {
-									result.encoding = this.getEncoding(resource, this.getPeferredEncoding(resource, options, value));
+									result.encoding = this.getEncoding(resource, this.getPeferredEncoding(resource, options, detected));
 									result.stream = decoder = encoding.decodeStream(result.encoding);
 									resolve(result);
 									handleChunk(bytesRead);
@@ -924,7 +922,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	private getPeferredEncoding(resource: uri, options: IResolveContentOptions, detected: IMimeAndEncoding): string {
+	private getPeferredEncoding(resource: uri, options: IResolveContentOptions, detected: encoding.IDetectedEncodingResult): string {
 		let preferredEncoding: string;
 		if (options && options.encoding) {
 			if (detected.encoding === encoding.UTF8 && options.encoding === encoding.UTF8) {
diff --git a/src/vs/workbench/services/search/node/worker/searchWorker.ts b/src/vs/workbench/services/search/node/worker/searchWorker.ts
index a9490a8e459..cdda1b2b257 100644
--- a/src/vs/workbench/services/search/node/worker/searchWorker.ts
+++ b/src/vs/workbench/services/search/node/worker/searchWorker.ts
@@ -13,9 +13,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { LineMatch, FileMatch } from '../search';
-import * as baseMime from 'vs/base/common/mime';
-import { UTF16le, UTF16be, UTF8, UTF8_with_bom, encodingExists, decode, bomLength } from 'vs/base/node/encoding';
-import { detectMimeAndEncodingFromBuffer } from 'vs/base/node/mime';
+import { UTF16le, UTF16be, UTF8, UTF8_with_bom, encodingExists, decode, bomLength, detectEncodingFromBuffer } from 'vs/base/node/encoding';
 
 import { ISearchWorker, ISearchWorkerSearchArgs, ISearchWorkerSearchResult } from './searchWorkerIpc';
 
@@ -208,13 +206,13 @@ export class SearchWorkerEngine {
 
 						// Detect encoding and mime when this is the beginning of the file
 						if (isFirstRead) {
-							const mimeAndEncoding = detectMimeAndEncodingFromBuffer({ buffer, bytesRead }, false);
-							if (mimeAndEncoding.mimes[mimeAndEncoding.mimes.length - 1] !== baseMime.MIME_TEXT) {
+							const detected = detectEncodingFromBuffer({ buffer, bytesRead }, false);
+							if (detected.seemsBinary) {
 								return clb(null); // skip files that seem binary
 							}
 
 							// Check for BOM offset
-							switch (mimeAndEncoding.encoding) {
+							switch (detected.encoding) {
 								case UTF8:
 									pos = i = bomLength(UTF8);
 									options.encoding = UTF8;

From d41edee83590f144ddba4047095ce07b6c8672ec Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 14:25:49 +0200
Subject: [PATCH 280/383] Workspace file: encoding should always be UTF-8
 (fixes #46935)

---
 .../files/electron-browser/fileService.ts     | 12 +++++-
 .../services/files/node/fileService.ts        | 13 ++++--
 .../files/test/node/fileService.test.ts       | 41 ++++++++++++++++++-
 3 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index fc90d82cce0..7adb118fced 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -25,6 +25,7 @@ import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import product from 'vs/platform/node/product';
 import { Schemas } from 'vs/base/common/network';
 import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
 
 export class FileService implements IFileService {
 
@@ -159,9 +160,16 @@ export class FileService implements IFileService {
 
 	private getEncodingOverrides(): IEncodingOverride[] {
 		const encodingOverride: IEncodingOverride[] = [];
-		encodingOverride.push({ resource: uri.file(this.environmentService.appSettingsHome), encoding: encoding.UTF8 });
+
+		// Global settings
+		encodingOverride.push({ parent: uri.file(this.environmentService.appSettingsHome), encoding: encoding.UTF8 });
+
+		// Workspace files
+		encodingOverride.push({ extension: WORKSPACE_EXTENSION, encoding: encoding.UTF8 });
+
+		// Folder Settings
 		this.contextService.getWorkspace().folders.forEach(folder => {
-			encodingOverride.push({ resource: uri.file(paths.join(folder.uri.fsPath, '.vscode')), encoding: encoding.UTF8 });
+			encodingOverride.push({ parent: uri.file(paths.join(folder.uri.fsPath, '.vscode')), encoding: encoding.UTF8 });
 		});
 
 		return encodingOverride;
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
index 44c7cba907a..1c97219d8c1 100644
--- a/src/vs/workbench/services/files/node/fileService.ts
+++ b/src/vs/workbench/services/files/node/fileService.ts
@@ -42,7 +42,8 @@ import { Readable } from 'stream';
 import { Schemas } from 'vs/base/common/network';
 
 export interface IEncodingOverride {
-	resource: uri;
+	parent?: uri;
+	extension?: string;
 	encoding: string;
 }
 
@@ -974,9 +975,13 @@ export class FileService implements IFileService {
 			for (let i = 0; i < this.options.encodingOverride.length; i++) {
 				const override = this.options.encodingOverride[i];
 
-				// check if the resource is a child of the resource with override and use
-				// the provided encoding in that case
-				if (isParent(resource.fsPath, override.resource.fsPath, !isLinux /* ignorecase */)) {
+				// check if the resource is child of encoding override path
+				if (override.parent && isParent(resource.fsPath, override.parent.fsPath, !isLinux /* ignorecase */)) {
+					return override.encoding;
+				}
+
+				// check if the resource extension is equal to encoding override
+				if (override.extension && paths.extname(resource.fsPath) === `.${override.extension}`) {
 					return override.encoding;
 				}
 			}
diff --git a/src/vs/workbench/services/files/test/node/fileService.test.ts b/src/vs/workbench/services/files/test/node/fileService.test.ts
index e526018a866..81b1537aa7f 100644
--- a/src/vs/workbench/services/files/test/node/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/node/fileService.test.ts
@@ -912,7 +912,7 @@ suite('FileService', () => {
 		}, 100);
 	});
 
-	test('options - encoding', function () {
+	test('options - encoding override (parent)', function () {
 
 		// setup
 		const _id = uuid.generateUuid();
@@ -922,7 +922,44 @@ suite('FileService', () => {
 		return pfs.copy(_sourceDir, _testDir).then(() => {
 			const encodingOverride: IEncodingOverride[] = [];
 			encodingOverride.push({
-				resource: uri.file(path.join(testDir, 'deep')),
+				parent: uri.file(path.join(testDir, 'deep')),
+				encoding: 'utf16le'
+			});
+
+			const configurationService = new TestConfigurationService();
+			configurationService.setUserConfiguration('files', { encoding: 'windows1252' });
+
+			const textResourceConfigurationService = new TestTextResourceConfigurationService(configurationService);
+
+			const _service = new FileService(new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))), TestEnvironmentService, textResourceConfigurationService, configurationService, new TestLifecycleService(), {
+				encodingOverride,
+				disableWatcher: true
+			});
+
+			return _service.resolveContent(uri.file(path.join(testDir, 'index.html'))).then(c => {
+				assert.equal(c.encoding, 'windows1252');
+
+				return _service.resolveContent(uri.file(path.join(testDir, 'deep', 'conway.js'))).then(c => {
+					assert.equal(c.encoding, 'utf16le');
+
+					// teardown
+					_service.dispose();
+				});
+			});
+		});
+	});
+
+	test('options - encoding override (extension)', function () {
+
+		// setup
+		const _id = uuid.generateUuid();
+		const _testDir = path.join(parentDir, _id);
+		const _sourceDir = require.toUrl('./fixtures/service');
+
+		return pfs.copy(_sourceDir, _testDir).then(() => {
+			const encodingOverride: IEncodingOverride[] = [];
+			encodingOverride.push({
+				extension: 'js',
 				encoding: 'utf16le'
 			});
 

From df381b6d1e4df1967dbd73fd3073ec2e3af08f7c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 30 Mar 2018 18:03:32 +0200
Subject: [PATCH 281/383] macOS: Add a setting to enable acceptsFirstMouse for
 window (fixes #24634)

---
 src/vs/code/electron-main/window.ts           | 10 +++++++-
 src/vs/platform/windows/common/windows.ts     |  1 +
 .../electron-browser/main.contribution.ts     |  6 +++++
 .../workbench/electron-browser/workbench.ts   |  1 +
 .../relauncher.contribution.ts                | 23 ++++++++++++-------
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 71c3c37e58e..e5968577d0b 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -151,8 +151,16 @@ export class CodeWindow implements ICodeWindow {
 
 		const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
 
+		if (isMacintosh) {
+			options.acceptFirstMouse = true; // enabled by default
+
+			if (windowConfig && windowConfig.clickThroughInactive === false) {
+				options.acceptFirstMouse = false;
+			}
+		}
+
 		let useNativeTabs = false;
-		if (windowConfig && windowConfig.nativeTabs) {
+		if (isMacintosh && windowConfig && windowConfig.nativeTabs === true) {
 			options.tabbingIdentifier = product.nameShort; // this opts in to sierra tabs
 			useNativeTabs = true;
 		}
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index 5c04d8c0640..5df0fccaa20 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -226,6 +226,7 @@ export interface IWindowSettings {
 	enableMenuBarMnemonics: boolean;
 	closeWhenEmpty: boolean;
 	smoothScrollingWorkaround: boolean;
+	clickThroughInactive: boolean;
 }
 
 export enum OpenContext {
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 87d47096eef..68c9acfe900 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -412,6 +412,12 @@ configurationRegistry.registerConfiguration({
 			'default': false,
 			'description': nls.localize('window.smoothScrollingWorkaround', "Enable this workaround if scrolling is no longer smooth after restoring a minimized VS Code window. This is a workaround for an issue (https://github.com/Microsoft/vscode/issues/13612) where scrolling starts to lag on devices with precision trackpads like the Surface devices from Microsoft. Enabling this workaround can result in a little bit of layout flickering after restoring the window from minimized state but is otherwise harmless."),
 			'included': isWindows
+		},
+		'window.clickThroughInactive': {
+			'type': 'boolean',
+			'default': true,
+			'description': nls.localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and execute the element under the mouse. If disabled, clicking anywhere on an inactive window will activate it only, without executing the element under the mouse."),
+			'included': isMacintosh
 		}
 	}
 });
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index ba962650df6..565f19c583d 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -424,6 +424,7 @@ export class Workbench implements IPartService {
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleDevToolsAction, ToggleDevToolsAction.ID, ToggleDevToolsAction.LABEL, isDeveloping ? { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_I, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_I } } : void 0), 'Developer: Toggle Developer Tools', localize('developer', "Developer"));
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenRecentAction, OpenRecentAction.ID, OpenRecentAction.LABEL, { primary: isDeveloping ? null : KeyMod.CtrlCmd | KeyCode.KEY_R, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_R } }), 'File: Open Recent...', localize('file', "File"));
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ReloadWindowWithExtensionsDisabledAction, ReloadWindowWithExtensionsDisabledAction.ID, ReloadWindowWithExtensionsDisabledAction.LABEL), 'Reload Window Without Extensions');
+
 		// Actions for macOS native tabs management (only when enabled)
 		const windowConfig = this.configurationService.getValue<IWindowConfiguration>();
 		if (windowConfig && windowConfig.window && windowConfig.window.nativeTabs) {
diff --git a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
index 0b63e5adb18..cc4f495a0d1 100644
--- a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
+++ b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
@@ -17,7 +17,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { RunOnceScheduler } from 'vs/base/common/async';
 import URI from 'vs/base/common/uri';
 import { isEqual } from 'vs/base/common/resources';
-import { isLinux } from 'vs/base/common/platform';
+import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 
@@ -34,6 +34,7 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 
 	private titleBarStyle: 'native' | 'custom';
 	private nativeTabs: boolean;
+	private clickThroughInactive: boolean;
 	private updateChannel: string;
 	private enableCrashReporter: boolean;
 	private touchbarEnabled: boolean;
@@ -72,18 +73,24 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 	private onConfigurationChange(config: IConfiguration, notify: boolean): void {
 		let changed = false;
 
-		// Titlebar style
-		if (config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) {
+		// macOS: Titlebar style
+		if (isMacintosh && config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) {
 			this.titleBarStyle = config.window.titleBarStyle;
 			changed = true;
 		}
 
-		// Native tabs
-		if (config.window && typeof config.window.nativeTabs === 'boolean' && config.window.nativeTabs !== this.nativeTabs) {
+		// macOS: Native tabs
+		if (isMacintosh && config.window && typeof config.window.nativeTabs === 'boolean' && config.window.nativeTabs !== this.nativeTabs) {
 			this.nativeTabs = config.window.nativeTabs;
 			changed = true;
 		}
 
+		// macOS: Click through (accept first mouse)
+		if (isMacintosh && config.window && typeof config.window.clickThroughInactive === 'boolean' && config.window.clickThroughInactive !== this.clickThroughInactive) {
+			this.clickThroughInactive = config.window.clickThroughInactive;
+			changed = true;
+		}
+
 		// Update channel
 		if (config.update && typeof config.update.channel === 'string' && config.update.channel !== this.updateChannel) {
 			this.updateChannel = config.update.channel;
@@ -96,8 +103,8 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 			changed = true;
 		}
 
-		// Touchbar config
-		if (config.keyboard && config.keyboard.touchbar && typeof config.keyboard.touchbar.enabled === 'boolean' && config.keyboard.touchbar.enabled !== this.touchbarEnabled) {
+		// macOS: Touchbar config
+		if (isMacintosh && config.keyboard && config.keyboard.touchbar && typeof config.keyboard.touchbar.enabled === 'boolean' && config.keyboard.touchbar.enabled !== this.touchbarEnabled) {
 			this.touchbarEnabled = config.keyboard.touchbar.enabled;
 			changed = true;
 		}
@@ -109,7 +116,7 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 		}
 
 		// Windows: smooth scrolling workaround
-		if (config.window && typeof config.window.smoothScrollingWorkaround === 'boolean' && config.window.smoothScrollingWorkaround !== this.windowsSmoothScrollingWorkaround) {
+		if (isWindows && config.window && typeof config.window.smoothScrollingWorkaround === 'boolean' && config.window.smoothScrollingWorkaround !== this.windowsSmoothScrollingWorkaround) {
 			this.windowsSmoothScrollingWorkaround = config.window.smoothScrollingWorkaround;
 			changed = true;
 		}

From f57c35c0f2da60e9dce2ff65459b9fbff1cca6e4 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 3 Apr 2018 14:29:05 +0200
Subject: [PATCH 282/383] Languages -> Programming Languages (for #47103)

---
 extensions/configuration-editing/package.json        | 4 ----
 extensions/css-language-features/package.json        | 3 +++
 extensions/extension-editing/package.json            | 4 ----
 extensions/html-language-features/package.json       | 3 +++
 extensions/json-language-features/package.json       | 3 +++
 extensions/markdown-basics/package.json              | 3 ---
 extensions/markdown-language-features/package.json   | 2 +-
 extensions/php-language-features/package.json        | 9 ++++++---
 extensions/typescript-language-features/package.json | 3 +++
 9 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 817d50a451d..7a6798f8eba 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -7,10 +7,6 @@
   "engines": {
     "vscode": "^1.0.0"
   },
-  "categories": [
-    "Languages",
-    "Other"
-  ],
   "activationEvents": [
     "onLanguage:json",
     "onLanguage:jsonc"
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 34bfb1b799c..f1eede08701 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -21,6 +21,9 @@
     "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
+	"categories": [
+		"Programming Languages"
+	],
   "contributes": {
     "configuration": [
       {
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index b5feab96d7a..e5c502426c0 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -7,10 +7,6 @@
 	"engines": {
 		"vscode": "^1.4.0"
 	},
-	"categories": [
-		"Languages",
-		"Other"
-	],
 	"activationEvents": [
 		"onLanguage:json",
 		"onLanguage:markdown",
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index c36e609a75b..f90024e779e 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -21,6 +21,9 @@
     "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
+  "categories": [
+		"Programming Languages"
+	],
   "contributes": {
     "configuration": {
       "id": "html",
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index d7043cb3aa7..1632b67bccf 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -20,6 +20,9 @@
     "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
+	"categories": [
+		"Programming Languages"
+	],
   "contributes": {
     "configuration": {
       "id": "json",
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index d2425177be9..8583ba0c8bc 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -7,9 +7,6 @@
 	"engines": {
 		"vscode": "^1.20.0"
 	},
-	"categories": [
-		"Languages"
-	],
 	"contributes": {
 		"languages": [
 			{
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index e02fb758ba2..d3fda69b63f 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -12,7 +12,7 @@
 	},
 	"main": "./out/extension",
 	"categories": [
-		"Languages"
+		"Programming Languages"
 	],
 	"activationEvents": [
 		"onLanguage:markdown",
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index da6ccc93199..dc2332a328f 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -12,9 +12,9 @@
 		"onLanguage:php"
 	],
 	"main": "./out/phpMain",
-	"dependencies": {
-		"vscode-nls": "^3.2.1"
-	},
+	"categories": [
+		"Programming Languages"
+	],
 	"contributes": {
 		"configuration": {
 			"title": "%configuration.title%",
@@ -76,6 +76,9 @@
 		"compile": "gulp compile-extension:php",
 		"watch": "gulp watch-extension:php"
 	},
+	"dependencies": {
+		"vscode-nls": "^3.2.1"
+	},
 	"devDependencies": {
 		"@types/node": "7.0.43"
 	}
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index e4b92c6fa46..6ef7b44302b 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -12,6 +12,9 @@
   "engines": {
     "vscode": "*"
   },
+	"categories": [
+		"Programming Languages"
+	],
   "dependencies": {
     "semver": "4.3.6",
     "vscode-extension-telemetry": "0.0.15",

From e0ca1920d808b8d122a15ee7ca3aead0de8beaf4 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 3 Apr 2018 14:29:43 +0200
Subject: [PATCH 283/383] Built-in group header: Languages -> Programming
 Languages (for #47103)

---
 .../parts/extensions/electron-browser/extensionsViewlet.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 3529fe7d3b3..47e91ea3a1e 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -240,7 +240,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 	private createSearchBuiltInBasicsExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
 			id: 'extensions.builtInBasicsExtensionsList',
-			name: localize('builtInBasicsExtensions', "Languages"),
+			name: localize('builtInBasicsExtensions', "Programming Languages"),
 			location: ViewLocation.Extensions,
 			ctor: BuiltInBasicsExtensionsView,
 			when: ContextKeyExpr.has('searchBuiltInExtensions'),

From cb64bf534635520dd914cc8b2a2ad0b066646dd7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 14:30:53 +0200
Subject: [PATCH 284/383] :lipstick: wording

---
 src/vs/workbench/electron-browser/main.contribution.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 68c9acfe900..41611135c33 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -416,7 +416,7 @@ configurationRegistry.registerConfiguration({
 		'window.clickThroughInactive': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and execute the element under the mouse. If disabled, clicking anywhere on an inactive window will activate it only, without executing the element under the mouse."),
+			'description': nls.localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and trigger the element under the mouse if it is clickable. If disabled, clicking anywhere on an inactive window will activate it only and a second click is required on the element."),
 			'included': isMacintosh
 		}
 	}

From 1b59c69373806d76e5ca39d89484fd74edca7372 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 14:35:22 +0200
Subject: [PATCH 285/383] files - refresh visible files when window gains focus

---
 .../browser/editors/fileEditorTracker.ts      | 23 +++++++++++++++++++
 src/vs/workbench/parts/files/common/files.ts  |  2 +-
 .../workbench/test/workbenchTestServices.ts   |  3 ++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
index fe2905822fd..f33c041e5b3 100644
--- a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
+++ b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
@@ -28,6 +28,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 export class FileEditorTracker implements IWorkbenchContribution {
 
@@ -46,6 +47,7 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@IWindowService private windowService: IWindowService
 	) {
 		this.toUnbind = [];
 		this.modelLoadQueue = new ResourceQueue();
@@ -67,6 +69,9 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		// Editor changing
 		this.toUnbind.push(this.editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
 
+		// Update visible editors when focus is gained
+		this.toUnbind.push(this.windowService.onDidChangeFocus(e => this.onWindowFocusChange(e)));
+
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
 
@@ -82,6 +87,24 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		}
 	}
 
+	private onWindowFocusChange(focused: boolean): void {
+		if (focused) {
+			// the window got focus and we use this as a hint that files might have been changed outside
+			// of this window. since file events can be unreliable, we queue a load for models that
+			// are visible in any editor. since this is a fast operation in the case nothing has changed,
+			// we tolerate the additional work.
+			distinct(
+				this.editorService.getVisibleEditors()
+					.map(editor => {
+						const resource = toResource(editor.input, { supportSideBySide: true });
+						return resource ? this.textFileService.models.get(resource) : void 0;
+					})
+					.filter(model => model && !model.isDirty()),
+				m => m.getResource().toString()
+			).forEach(model => this.queueModelLoad(model));
+		}
+	}
+
 	// Note: there is some duplication with the other file event handler below. Since we cannot always rely on the disk events
 	// carrying all necessary data in all environments, we also use the file operation events to make sure operations are handled.
 	// In any case there is no guarantee if the local event is fired first or the disk one. Thus, code must handle the case
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
index 1c492a3a555..1465f5ac6d5 100644
--- a/src/vs/workbench/parts/files/common/files.ts
+++ b/src/vs/workbench/parts/files/common/files.ts
@@ -151,7 +151,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 			// Make sure to keep contents on disk up to date when it changes
 			if (!this.fileWatcher) {
 				this.fileWatcher = this.fileService.onFileChanges(changes => {
-					if (changes.contains(fileOnDiskResource, FileChangeType.UPDATED)) { //
+					if (changes.contains(fileOnDiskResource, FileChangeType.UPDATED)) {
 						this.resolveEditorModel(resource, false /* do not create if missing */).done(null, onUnexpectedError); // update model when resource changes
 					}
 				});
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 545ded7f0a3..af76f5abce9 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -257,6 +257,7 @@ export function workbenchInstantiationService(): IInstantiationService {
 	instantiationService.stub(ITelemetryService, NullTelemetryService);
 	instantiationService.stub(INotificationService, new TestNotificationService());
 	instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
+	instantiationService.stub(IWindowService, new TestWindowService());
 	instantiationService.stub(IWindowsService, new TestWindowsService());
 	instantiationService.stub(ITextFileService, <ITextFileService>instantiationService.createInstance(TestTextFileService));
 	instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
@@ -896,7 +897,7 @@ export class TestWindowService implements IWindowService {
 
 	public _serviceBrand: any;
 
-	onDidChangeFocus: Event<boolean>;
+	onDidChangeFocus: Event<boolean> = new Emitter<boolean>().event;
 
 	isFocused(): TPromise<boolean> {
 		return TPromise.as(false);

From ea284a1fed56670310c20d9d45a7492aa453c52e Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 3 Apr 2018 14:37:24 +0200
Subject: [PATCH 286/383] Increase the timeout to retry and remove the fallback

---
 .../node/extensionManagementService.ts                   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index f13a2deb963..21960eff79c 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -404,7 +404,6 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		const tempPath = path.join(this.extensionsPath, `.${id}`);
 		const extensionPath = path.join(this.extensionsPath, id);
 		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
-			.then(null, error => this.isWindowsEPERMError(error) ? this.extract(id, zipPath, extensionPath) : TPromise.wrapError(error))
 			.then(() => {
 				this.logService.info('Installation completed.', id);
 				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
@@ -420,7 +419,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 
 	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string): TPromise<void> {
 		return this.extract(id, zipPath, extractPath)
-			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (5 * 1000) /* Retry for 5 seconds */)
+			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (20 * 1000) /* Retry for 20 seconds */)
 				.then(
 					() => this.logService.info('Renamed to', renamePath),
 					e => {
@@ -444,16 +443,12 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private rename(id: string, extractPath: string, renamePath: string, retryUntil: number): TPromise<void> {
 		return pfs.rename(extractPath, renamePath)
 			.then(null, error =>
-				this.isWindowsEPERMError(error) && Date.now() < retryUntil
+				isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil
 					? this.rename(id, extractPath, renamePath, retryUntil)
 					: TPromise.wrapError(error)
 			);
 	}
 
-	private isWindowsEPERMError(error: any): boolean {
-		return isWindows && error && error.code === 'EPERM';
-	}
-
 	private rollback(extensions: IGalleryExtension[]): TPromise<void> {
 		return this.getInstalled(LocalExtensionType.User)
 			.then(installed =>

From 470c743a1ac5a71ab66eb6ddeae7f84d449f7470 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Sat, 31 Mar 2018 09:24:05 +0200
Subject: [PATCH 287/383] debt - reduce amount of work when file events occur

---
 .../debug/electron-browser/debugService.ts    |  2 +-
 .../electron-browser/views/explorerView.ts    | 35 +++++----
 .../textfile/common/textFileEditorModel.ts    | 71 +++++++++++--------
 3 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index af8dd4aeada..38a38972a81 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -1307,7 +1307,7 @@ export class DebugService implements debug.IDebugService {
 			if (this.breakpointsToSendOnResourceSaved.delete(event.resource.toString())) {
 				this.sendBreakpoints(event.resource, true).done(null, errors.onUnexpectedError);
 			}
-			if (event.resource.toString().indexOf('.vscode/launch.json') >= 0) {
+			if (strings.endsWith(event.resource.toString(), '.vscode/launch.json')) {
 				this.launchJsonChanged = true;
 			}
 		});
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
index 62162c145af..c98732c93e7 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -611,24 +611,21 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	}
 
 	private shouldRefreshFromEvent(e: FileChangesEvent): boolean {
-
-		// Filter to the ones we care
-		e = this.filterFileEvents(e);
-
 		if (!this.isCreated) {
 			return false;
 		}
 
-		if (e.gotAdded()) {
-			const added = e.getAdded();
+		// Filter to the ones we care
+		e = this.filterToViewRelevantEvents(e);
+
+		// Handle added files/folders
+		const added = e.getAdded();
+		if (added.length) {
 
 			// Check added: Refresh if added file/folder is not part of resolved root and parent is part of it
 			const ignoredPaths: { [resource: string]: boolean } = <{ [resource: string]: boolean }>{};
 			for (let i = 0; i < added.length; i++) {
 				const change = added[i];
-				if (!this.contextService.isInsideWorkspace(change.resource)) {
-					continue; // out of workspace file
-				}
 
 				// Find parent
 				const parent = resources.dirname(change.resource);
@@ -651,15 +648,13 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			}
 		}
 
-		if (e.gotDeleted()) {
-			const deleted = e.getDeleted();
+		// Handle deleted files/folders
+		const deleted = e.getDeleted();
+		if (deleted.length) {
 
 			// Check deleted: Refresh if deleted file/folder part of resolved root
 			for (let j = 0; j < deleted.length; j++) {
 				const del = deleted[j];
-				if (!this.contextService.isInsideWorkspace(del.resource)) {
-					continue; // out of workspace file
-				}
 
 				if (this.model.findClosest(del.resource)) {
 					return true;
@@ -667,15 +662,13 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			}
 		}
 
-		if (this.sortOrder === SortOrderConfiguration.MODIFIED && e.gotUpdated()) {
+		// Handle updated files/folders if we sort by modified
+		if (this.sortOrder === SortOrderConfiguration.MODIFIED) {
 			const updated = e.getUpdated();
 
 			// Check updated: Refresh if updated file/folder part of resolved root
 			for (let j = 0; j < updated.length; j++) {
 				const upd = updated[j];
-				if (!this.contextService.isInsideWorkspace(upd.resource)) {
-					continue; // out of workspace file
-				}
 
 				if (this.model.findClosest(upd.resource)) {
 					return true;
@@ -686,8 +679,12 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		return false;
 	}
 
-	private filterFileEvents(e: FileChangesEvent): FileChangesEvent {
+	private filterToViewRelevantEvents(e: FileChangesEvent): FileChangesEvent {
 		return new FileChangesEvent(e.changes.filter(change => {
+			if (change.type === FileChangeType.UPDATED && this.sortOrder !== SortOrderConfiguration.MODIFIED) {
+				return false; // we only are about updated if we sort by modified time
+			}
+
 			if (!this.contextService.isInsideWorkspace(change.resource)) {
 				return false; // exclude changes for resources outside of workspace
 			}
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 331d0e9dfb9..c39a6227749 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -128,38 +128,51 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private onFileChanges(e: FileChangesEvent): void {
+		let fileEventImpactsModel = false;
+		let newInOrphanModeGuess: boolean;
 
-		// Track ADD and DELETES for updates of this model to orphan-mode
-		const modelFileDeleted = e.contains(this.resource, FileChangeType.DELETED);
-		const modelFileAdded = e.contains(this.resource, FileChangeType.ADDED);
-
-		if (modelFileDeleted || modelFileAdded) {
-			const newInOrphanModeGuess = modelFileDeleted && !modelFileAdded;
-			if (this.inOrphanMode !== newInOrphanModeGuess) {
-				let checkOrphanedPromise: TPromise<boolean>;
-				if (newInOrphanModeGuess) {
-					// We have received reports of users seeing delete events even though the file still
-					// exists (network shares issue: https://github.com/Microsoft/vscode/issues/13665).
-					// Since we do not want to mark the model as orphaned, we have to check if the
-					// file is really gone and not just a faulty file event.
-					checkOrphanedPromise = TPromise.timeout(100).then(() => {
-						if (this.disposed) {
-							return true;
-						}
-
-						return this.fileService.existsFile(this.resource).then(exists => !exists);
-					});
-				} else {
-					checkOrphanedPromise = TPromise.as(false);
-				}
-
-				checkOrphanedPromise.done(newInOrphanModeValidated => {
-					if (this.inOrphanMode !== newInOrphanModeValidated && !this.disposed) {
-						this.setOrphaned(newInOrphanModeValidated);
-					}
-				});
+		// If we are currently orphaned, we check if the model file was added back
+		if (this.inOrphanMode) {
+			const modelFileAdded = e.contains(this.resource, FileChangeType.ADDED);
+			if (modelFileAdded) {
+				newInOrphanModeGuess = false;
+				fileEventImpactsModel = true;
 			}
 		}
+
+		// Otherwise we check if the model file was deleted
+		else {
+			const modelFileDeleted = e.contains(this.resource, FileChangeType.DELETED);
+			if (modelFileDeleted) {
+				newInOrphanModeGuess = true;
+				fileEventImpactsModel = true;
+			}
+		}
+
+		if (fileEventImpactsModel && this.inOrphanMode !== newInOrphanModeGuess) {
+			let checkOrphanedPromise: TPromise<boolean>;
+			if (newInOrphanModeGuess) {
+				// We have received reports of users seeing delete events even though the file still
+				// exists (network shares issue: https://github.com/Microsoft/vscode/issues/13665).
+				// Since we do not want to mark the model as orphaned, we have to check if the
+				// file is really gone and not just a faulty file event.
+				checkOrphanedPromise = TPromise.timeout(100).then(() => {
+					if (this.disposed) {
+						return true;
+					}
+
+					return this.fileService.existsFile(this.resource).then(exists => !exists);
+				});
+			} else {
+				checkOrphanedPromise = TPromise.as(false);
+			}
+
+			checkOrphanedPromise.done(newInOrphanModeValidated => {
+				if (this.inOrphanMode !== newInOrphanModeValidated && !this.disposed) {
+					this.setOrphaned(newInOrphanModeValidated);
+				}
+			});
+		}
 	}
 
 	private setOrphaned(orphaned: boolean): void {

From c72b0bb40848aed0a9278c1b7a9b8f99157da7c7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Sat, 31 Mar 2018 14:33:08 +0200
Subject: [PATCH 288/383] debt - reduce usage of Builder pattern

---
 src/vs/base/browser/builder.ts                | 63 ++-----------------
 src/vs/base/browser/dnd.ts                    | 16 +++--
 src/vs/base/browser/dom.ts                    | 55 ++++++++++++++++
 src/vs/base/browser/ui/actionbar/actionbar.ts | 10 +--
 src/vs/base/browser/ui/button/button.ts       | 12 +---
 .../browser/ui/contextview/contextview.ts     |  1 -
 src/vs/base/browser/ui/dropdown/dropdown.ts   | 22 +++----
 src/vs/base/browser/ui/menu/menu.ts           | 10 +--
 .../browser/ui/progressbar/progressbar.ts     | 29 +++++----
 src/vs/base/browser/ui/sash/sash.ts           | 29 +++++----
 src/vs/base/browser/ui/toolbar/toolbar.ts     |  5 +-
 .../quickopen/browser/quickOpenWidget.ts      | 34 +++++-----
 src/vs/base/test/browser/builder.test.ts      | 15 ++++-
 src/vs/base/test/browser/progressBar.test.ts  |  6 +-
 .../contrib/referenceSearch/peekViewWidget.ts |  2 +-
 .../quickOpen/quickOpenEditorWidget.ts        |  4 +-
 src/vs/workbench/browser/composite.ts         |  8 +--
 src/vs/workbench/browser/layout.ts            | 31 +++++----
 src/vs/workbench/browser/part.ts              |  6 +-
 .../parts/activitybar/activitybarPart.ts      |  4 +-
 .../workbench/browser/parts/compositePart.ts  | 35 ++++++-----
 .../parts/compositebar/compositeBar.ts        | 13 ++--
 .../parts/compositebar/compositeBarActions.ts |  2 +-
 .../browser/parts/editor/binaryEditor.ts      |  3 +-
 .../parts/editor/editorGroupsControl.ts       | 30 ++++-----
 .../browser/parts/editor/editorPart.ts        |  4 +-
 .../parts/editor/noTabsTitleControl.ts        |  2 +-
 .../browser/parts/editor/resourceViewer.ts    |  6 +-
 .../browser/parts/editor/sideBySideEditor.ts  | 12 ++--
 .../browser/parts/editor/tabsTitleControl.ts  |  7 +--
 .../browser/parts/editor/textEditor.ts        |  4 +-
 .../browser/parts/editor/titleControl.ts      |  5 +-
 .../notifications/notificationsCenter.ts      |  3 +-
 .../notifications/notificationsToasts.ts      |  3 +-
 .../notifications/notificationsViewer.ts      |  8 +--
 .../browser/parts/panel/panelPart.ts          |  5 +-
 .../browser/parts/quickinput/quickInput.ts    |  7 +--
 .../parts/quickopen/quickOpenController.ts    | 25 ++++----
 .../browser/parts/sidebar/sidebarPart.ts      |  2 +-
 .../browser/parts/titlebar/titlebarPart.ts    | 20 +++---
 .../browser/parts/views/panelViewlet.ts       |  4 +-
 .../browser/parts/views/viewsViewlet.ts       |  6 +-
 src/vs/workbench/electron-browser/shell.ts    | 30 ++++-----
 .../workbench/electron-browser/workbench.ts   |  8 +--
 .../parts/debug/browser/debugActionsWidget.ts |  4 +-
 .../parts/debug/electron-browser/repl.ts      |  6 +-
 .../electron-browser/extensionsViewlet.ts     |  4 +-
 .../runtimeExtensionsEditor.ts                |  6 +-
 .../feedback/electron-browser/feedback.ts     |  8 +--
 .../electron-browser/feedbackStatusbarItem.ts |  2 +-
 .../files/electron-browser/views/emptyView.ts |  2 +-
 .../electron-browser/baseWebviewEditor.ts     |  2 +-
 .../html/electron-browser/htmlPreviewPart.ts  |  4 +-
 .../markers/electron-browser/markersPanel.ts  |  2 +-
 .../preferences/browser/keybindingWidgets.ts  |  5 +-
 .../preferences/browser/keybindingsEditor.ts  |  6 +-
 .../preferences/browser/preferencesEditor.ts  | 16 ++---
 .../preferences/browser/preferencesWidgets.ts |  4 +-
 .../parts/scm/electron-browser/scmViewlet.ts  |  4 +-
 .../search/browser/patternInputWidget.ts      |  5 +-
 .../parts/search/browser/searchView.ts        |  6 +-
 .../electron-browser/terminalInstance.ts      | 13 ++--
 .../electron-browser/terminalPanel.ts         |  8 +--
 .../watermark/electron-browser/watermark.ts   |  4 +-
 .../webview/electron-browser/webviewEditor.ts |  4 +-
 .../electron-browser/walkThroughPart.ts       |  3 +-
 .../services/part/common/partService.ts       |  4 +-
 .../progress/browser/progressService.ts       | 30 +++------
 .../electron-browser/workbenchThemeService.ts | 14 ++---
 src/vs/workbench/test/browser/part.test.ts    | 16 ++---
 .../workbench/test/workbenchTestServices.ts   |  6 +-
 71 files changed, 396 insertions(+), 398 deletions(-)

diff --git a/src/vs/base/browser/builder.ts b/src/vs/base/browser/builder.ts
index 83cbd65af57..b47acecc5ae 100644
--- a/src/vs/base/browser/builder.ts
+++ b/src/vs/base/browser/builder.ts
@@ -43,26 +43,6 @@ export interface QuickBuilder {
 	(builder: Builder): Builder;
 }
 
-/**
- * Create a new builder from the element that is uniquely identified by the given identifier. If the
- *  second parameter "offdom" is set to true, the created elements will only be added to the provided
- *  element when the build() method is called.
- */
-export function withElementById(id: string, offdom?: boolean): Builder {
-	assert.ok(types.isString(id), 'Expected String as parameter');
-
-	let element = document.getElementById(id);
-	if (element) {
-		return new Builder(element, offdom);
-	}
-
-	return null;
-}
-
-export const Build = {
-	withElementById: withElementById
-};
-
 // --- Implementation starts here
 
 let MS_DATA_KEY = '_msDataKey';
@@ -70,16 +50,6 @@ let DATA_BINDING_ID = '__$binding';
 let LISTENER_BINDING_ID = '__$listeners';
 let VISIBILITY_BINDING_ID = '__$visibility';
 
-export class Dimension {
-	public width: number;
-	public height: number;
-
-	constructor(width: number, height: number) {
-		this.width = width;
-		this.height = height;
-	}
-}
-
 function data(element: any): any {
 	if (!element[MS_DATA_KEY]) {
 		element[MS_DATA_KEY] = {};
@@ -1206,39 +1176,18 @@ export class Builder implements IDisposable {
 	/**
 	 *  Gets the size (in pixels) of an element, including the margin.
 	 */
-	public getTotalSize(): Dimension {
+	public getTotalSize(): DOM.Dimension {
 		let totalWidth = DOM.getTotalWidth(this.currentElement);
 		let totalHeight = DOM.getTotalHeight(this.currentElement);
 
-		return new Dimension(totalWidth, totalHeight);
+		return new DOM.Dimension(totalWidth, totalHeight);
 	}
 
 	/**
 	 *  Another variant of getting the inner dimensions of an element.
 	 */
-	public getClientArea(): Dimension {
-
-		// 0.) Try with DOM clientWidth / clientHeight
-		if (this.currentElement !== document.body) {
-			return new Dimension(this.currentElement.clientWidth, this.currentElement.clientHeight);
-		}
-
-		// 1.) Try innerWidth / innerHeight
-		if (window.innerWidth && window.innerHeight) {
-			return new Dimension(window.innerWidth, window.innerHeight);
-		}
-
-		// 2.) Try with document.body.clientWidth / document.body.clientHeigh
-		if (document.body && document.body.clientWidth && document.body.clientWidth) {
-			return new Dimension(document.body.clientWidth, document.body.clientHeight);
-		}
-
-		// 3.) Try with document.documentElement.clientWidth / document.documentElement.clientHeight
-		if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientHeight) {
-			return new Dimension(document.documentElement.clientWidth, document.documentElement.clientHeight);
-		}
-
-		throw new Error('Unable to figure out browser width and height');
+	public getClientArea(): DOM.Dimension {
+		return DOM.getClientArea(this.currentElement);
 	}
 }
 
@@ -1484,7 +1433,3 @@ export const $: QuickBuilder = function (arg?: any): Builder {
 		throw new Error('Bad use of $');
 	}
 };
-
-(<any>$).Dimension = Dimension;
-(<any>$).Builder = Builder;
-(<any>$).Build = Build;
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
index 82e5954e301..44d337f3b3a 100644
--- a/src/vs/base/browser/dnd.ts
+++ b/src/vs/base/browser/dnd.ts
@@ -5,18 +5,19 @@
 
 'use strict';
 
-import { $ } from 'vs/base/browser/builder';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { addDisposableListener } from 'vs/base/browser/dom';
 
 /**
  * A helper that will execute a provided function when the provided HTMLElement receives
  *  dragover event for 800ms. If the drag is aborted before, the callback will not be triggered.
  */
 export class DelayedDragHandler {
-
+	private toDispose: IDisposable[] = [];
 	private timeout: number;
 
 	constructor(container: HTMLElement, callback: () => void) {
-		$(container).on('dragover', () => {
+		this.toDispose.push(addDisposableListener(container, 'dragover', () => {
 			if (!this.timeout) {
 				this.timeout = setTimeout(() => {
 					callback();
@@ -24,9 +25,13 @@ export class DelayedDragHandler {
 					this.timeout = null;
 				}, 800);
 			}
-		});
+		}));
 
-		$(container).on(['dragleave', 'drop', 'dragend'], () => this.clearDragTimeout());
+		['dragleave', 'drop', 'dragend'].forEach(type => {
+			this.toDispose.push(addDisposableListener(container, type, () => {
+				this.clearDragTimeout();
+			}));
+		});
 	}
 
 	private clearDragTimeout(): void {
@@ -37,6 +42,7 @@ export class DelayedDragHandler {
 	}
 
 	public dispose(): void {
+		this.toDispose = dispose(this.toDispose);
 		this.clearDragTimeout();
 	}
 }
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 7a5b9af1249..75248d70562 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -35,7 +35,9 @@ export function isInDOM(node: Node): boolean {
 interface IDomClassList {
 	hasClass(node: HTMLElement, className: string): boolean;
 	addClass(node: HTMLElement, className: string): void;
+	addClasses(node: HTMLElement, ...classNames: string[]): void;
 	removeClass(node: HTMLElement, className: string): void;
+	removeClasses(node: HTMLElement, ...classNames: string[]): void;
 	toggleClass(node: HTMLElement, className: string, shouldHaveIt?: boolean): void;
 }
 
@@ -110,6 +112,10 @@ const _manualClassList = new class implements IDomClassList {
 		return this._lastStart !== -1;
 	}
 
+	addClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.addClass(node, name)));
+	}
+
 	addClass(node: HTMLElement, className: string): void {
 		if (!node.className) { // doesn't have it for sure
 			node.className = className;
@@ -130,6 +136,10 @@ const _manualClassList = new class implements IDomClassList {
 		}
 	}
 
+	removeClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.removeClass(node, name)));
+	}
+
 	toggleClass(node: HTMLElement, className: string, shouldHaveIt?: boolean): void {
 		this._findClassName(node, className);
 		if (this._lastStart !== -1 && (shouldHaveIt === void 0 || !shouldHaveIt)) {
@@ -146,6 +156,10 @@ const _nativeClassList = new class implements IDomClassList {
 		return className && node.classList && node.classList.contains(className);
 	}
 
+	addClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.addClass(node, name)));
+	}
+
 	addClass(node: HTMLElement, className: string): void {
 		if (className && node.classList) {
 			node.classList.add(className);
@@ -158,6 +172,10 @@ const _nativeClassList = new class implements IDomClassList {
 		}
 	}
 
+	removeClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.removeClass(node, name)));
+	}
+
 	toggleClass(node: HTMLElement, className: string, shouldHaveIt?: boolean): void {
 		if (node.classList) {
 			node.classList.toggle(className, shouldHaveIt);
@@ -170,7 +188,9 @@ const _nativeClassList = new class implements IDomClassList {
 const _classList: IDomClassList = browser.isIE ? _manualClassList : _nativeClassList;
 export const hasClass: (node: HTMLElement, className: string) => boolean = _classList.hasClass.bind(_classList);
 export const addClass: (node: HTMLElement, className: string) => void = _classList.addClass.bind(_classList);
+export const addClasses: (node: HTMLElement, ...classNames: string[]) => void = _classList.addClasses.bind(_classList);
 export const removeClass: (node: HTMLElement, className: string) => void = _classList.removeClass.bind(_classList);
+export const removeClasses: (node: HTMLElement, ...classNames: string[]) => void = _classList.removeClasses.bind(_classList);
 export const toggleClass: (node: HTMLElement, className: string, shouldHaveIt?: boolean) => void = _classList.toggleClass.bind(_classList);
 
 class DomListener implements IDisposable {
@@ -454,6 +474,31 @@ function getDimension(element: HTMLElement, cssPropertyName: string, jsPropertyN
 	return convertToPixels(element, value);
 }
 
+export function getClientArea(element: HTMLElement): Dimension {
+
+	// Try with DOM clientWidth / clientHeight
+	if (element !== document.body) {
+		return new Dimension(element.clientWidth, element.clientHeight);
+	}
+
+	// Try innerWidth / innerHeight
+	if (window.innerWidth && window.innerHeight) {
+		return new Dimension(window.innerWidth, window.innerHeight);
+	}
+
+	// Try with document.body.clientWidth / document.body.clientHeigh
+	if (document.body && document.body.clientWidth && document.body.clientWidth) {
+		return new Dimension(document.body.clientWidth, document.body.clientHeight);
+	}
+
+	// Try with document.documentElement.clientWidth / document.documentElement.clientHeight
+	if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientHeight) {
+		return new Dimension(document.documentElement.clientWidth, document.documentElement.clientHeight);
+	}
+
+	throw new Error('Unable to figure out browser width and height');
+}
+
 const sizeUtils = {
 
 	getBorderLeftWidth: function (element: HTMLElement): number {
@@ -500,6 +545,16 @@ const sizeUtils = {
 // ----------------------------------------------------------------------------------------
 // Position & Dimension
 
+export class Dimension {
+	public width: number;
+	public height: number;
+
+	constructor(width: number, height: number) {
+		this.width = width;
+		this.height = height;
+	}
+}
+
 export function getTopLeftOffset(element: HTMLElement): { left: number; top: number; } {
 	// Adapted from WinJS.Utilities.getPosition
 	// and added borders to the mix
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index cda6b71cc41..0cdee6a8405 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -386,7 +386,7 @@ export class ActionBar implements IActionRunner {
 	private _onDidRun = new Emitter<IRunEvent>();
 	private _onDidBeforeRun = new Emitter<IRunEvent>();
 
-	constructor(container: HTMLElement | Builder, options: IActionBarOptions = defaultOptions) {
+	constructor(container: HTMLElement, options: IActionBarOptions = defaultOptions) {
 		this.options = options;
 		this._context = options.context;
 		this.toDispose = [];
@@ -496,7 +496,7 @@ export class ActionBar implements IActionRunner {
 
 		this.domNode.appendChild(this.actionsList);
 
-		((container instanceof Builder) ? container.getHTMLElement() : container).appendChild(this.domNode);
+		container.appendChild(this.domNode);
 	}
 
 	public get onDidBlur(): Event<void> {
@@ -553,8 +553,8 @@ export class ActionBar implements IActionRunner {
 		}
 	}
 
-	public getContainer(): Builder {
-		return $(this.domNode);
+	public getContainer(): HTMLElement {
+		return this.domNode;
 	}
 
 	public push(arg: IAction | IAction[], options: IActionOptions = {}): void {
@@ -748,7 +748,7 @@ export class ActionBar implements IActionRunner {
 
 		this.toDispose = lifecycle.dispose(this.toDispose);
 
-		this.getContainer().destroy();
+		$(this.getContainer()).destroy();
 	}
 }
 
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index a31eec3902b..129009f5088 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -48,9 +48,7 @@ export class Button {
 
 	private focusTracker: DOM.IFocusTracker;
 
-	constructor(container: Builder, options?: IButtonOptions);
-	constructor(container: HTMLElement, options?: IButtonOptions);
-	constructor(container: any, options?: IButtonOptions) {
+	constructor(container: HTMLElement, options?: IButtonOptions) {
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOptions, false);
 
@@ -197,9 +195,7 @@ export class ButtonGroup {
 	private _buttons: Button[];
 	private toDispose: IDisposable[];
 
-	constructor(container: Builder, count: number, options?: IButtonOptions);
-	constructor(container: HTMLElement, count: number, options?: IButtonOptions);
-	constructor(container: any, count: number, options?: IButtonOptions) {
+	constructor(container: HTMLElement, count: number, options?: IButtonOptions) {
 		this._buttons = [];
 		this.toDispose = [];
 
@@ -210,9 +206,7 @@ export class ButtonGroup {
 		return this._buttons;
 	}
 
-	private create(container: Builder, count: number, options?: IButtonOptions): void;
-	private create(container: HTMLElement, count: number, options?: IButtonOptions): void;
-	private create(container: any, count: number, options?: IButtonOptions): void {
+	private create(container: HTMLElement, count: number, options?: IButtonOptions): void {
 		for (let index = 0; index < count; index++) {
 			const button = new Button(container, options);
 			this._buttons.push(button);
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
index 78ddfdb7361..b5b1c296425 100644
--- a/src/vs/base/browser/ui/contextview/contextview.ts
+++ b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-
 'use strict';
 
 import 'vs/css!./contextview';
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index 71aeccbe84c..fd4081e90c7 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -15,7 +15,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IContextViewProvider, IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { IMenuOptions } from 'vs/base/browser/ui/menu/menu';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { EventHelper, EventType } from 'vs/base/browser/dom';
+import { EventHelper, EventType, removeClass, addClass } from 'vs/base/browser/dom';
 import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
 
 export interface ILabelRenderer {
@@ -79,12 +79,12 @@ export class BaseDropdown extends ActionRunner {
 		return this._toDispose;
 	}
 
-	public get element(): Builder {
-		return this.$el;
+	public get element(): HTMLElement {
+		return this.$el.getHTMLElement();
 	}
 
-	public get label(): Builder {
-		return this.$label;
+	public get label(): HTMLElement {
+		return this.$label.getHTMLElement();
 	}
 
 	public set tooltip(tooltip: string) {
@@ -142,7 +142,7 @@ export class Dropdown extends BaseDropdown {
 	public show(): void {
 		super.show();
 
-		this.element.addClass('active');
+		addClass(this.element, 'active');
 
 		this.contextViewProvider.showContextView({
 			getAnchor: () => this.getAnchor(),
@@ -160,11 +160,11 @@ export class Dropdown extends BaseDropdown {
 	}
 
 	protected getAnchor(): HTMLElement | IAnchor {
-		return this.element.getHTMLElement();
+		return this.element;
 	}
 
 	protected onHide(): void {
-		this.element.removeClass('active');
+		removeClass(this.element, 'active');
 	}
 
 	public hide(): void {
@@ -234,16 +234,16 @@ export class DropdownMenu extends BaseDropdown {
 	public show(): void {
 		super.show();
 
-		this.element.addClass('active');
+		addClass(this.element, 'active');
 
 		this._contextMenuProvider.showContextMenu({
-			getAnchor: () => this.element.getHTMLElement(),
+			getAnchor: () => this.element,
 			getActions: () => TPromise.as(this.actions),
 			getActionsContext: () => this.menuOptions ? this.menuOptions.context : null,
 			getActionItem: (action) => this.menuOptions && this.menuOptions.actionItemProvider ? this.menuOptions.actionItemProvider(action) : null,
 			getKeyBinding: (action: IAction) => this.menuOptions && this.menuOptions.getKeyBinding ? this.menuOptions.getKeyBinding(action) : null,
 			getMenuClassName: () => this.menuClassName,
-			onHide: () => this.element.removeClass('active'),
+			onHide: () => removeClass(this.element, 'active'),
 			actionRunner: this.menuOptions ? this.menuOptions.actionRunner : null
 		});
 	}
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index b73be1a0f2d..16c9a2a69a7 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -7,11 +7,11 @@
 
 import 'vs/css!./menu';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { $ } from 'vs/base/browser/builder';
 import { IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionBar, IActionItemProvider, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { Event } from 'vs/base/common/event';
+import { addClass } from 'vs/base/browser/dom';
 
 export interface IMenuOptions {
 	context?: any;
@@ -26,11 +26,13 @@ export class Menu {
 	private listener: IDisposable;
 
 	constructor(container: HTMLElement, actions: IAction[], options: IMenuOptions = {}) {
-		$(container).addClass('monaco-menu-container');
+		addClass(container, 'monaco-menu-container');
 
-		let $menu = $('.monaco-menu').appendTo(container);
+		let menuContainer = document.createElement('div');
+		addClass(menuContainer, 'monaco-menu');
+		container.appendChild(menuContainer);
 
-		this.actionBar = new ActionBar($menu, {
+		this.actionBar = new ActionBar(menuContainer, {
 			orientation: ActionsOrientation.VERTICAL,
 			actionItemProvider: options.actionItemProvider,
 			context: options.context,
diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts
index 7a08ea37265..b6a3a856ff7 100644
--- a/src/vs/base/browser/ui/progressbar/progressbar.ts
+++ b/src/vs/base/browser/ui/progressbar/progressbar.ts
@@ -45,9 +45,7 @@ export class ProgressBar {
 	private animationStopToken: ValueCallback;
 	private progressBarBackground: Color;
 
-	constructor(container: Builder, options?: IProgressBarOptions);
-	constructor(container: HTMLElement, options?: IProgressBarOptions);
-	constructor(container: any, options?: IProgressBarOptions) {
+	constructor(container: HTMLElement, options?: IProgressBarOptions) {
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOpts, false);
 
@@ -59,10 +57,8 @@ export class ProgressBar {
 		this.create(container);
 	}
 
-	private create(container: Builder): void;
-	private create(container: HTMLElement): void;
-	private create(container: any): void {
-		$(container).div({ 'class': css_progress_container }, (builder) => {
+	private create(container: HTMLElement): void {
+		$(container).div({ 'class': css_progress_container }, builder => {
 			this.element = builder.clone();
 
 			builder.div({ 'class': css_progress_bit }).on([DOM.EventType.ANIMATION_START, DOM.EventType.ANIMATION_END, DOM.EventType.ANIMATION_ITERATION], (e: Event) => {
@@ -201,11 +197,20 @@ export class ProgressBar {
 		return this;
 	}
 
-	/**
-	 * Returns the builder this progress bar is building in.
-	 */
-	public getContainer(): Builder {
-		return $(this.element);
+	public getContainer(): HTMLElement {
+		return this.element.getHTMLElement();
+	}
+
+	public show(delay?: number): void {
+		if (typeof delay === 'number') {
+			this.element.showDelayed(delay);
+		} else {
+			this.element.show();
+		}
+	}
+
+	public hide(): void {
+		this.element.hide();
 	}
 
 	public style(styles: IProgressBarStyles): void {
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
index 44701f7b59e..d0a2d30d3e2 100644
--- a/src/vs/base/browser/ui/sash/sash.ts
+++ b/src/vs/base/browser/ui/sash/sash.ts
@@ -7,14 +7,14 @@
 
 import 'vs/css!./sash';
 import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { isIPad } from 'vs/base/browser/browser';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as types from 'vs/base/common/types';
-import * as DOM from 'vs/base/browser/dom';
 import { EventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Event, Emitter } from 'vs/base/common/event';
+import { getElementsByTagName, EventHelper, EventType as DOMEventType, createStyleSheet, addDisposableListener, Dimension } from 'vs/base/browser/dom';
 
 export interface ISashLayoutProvider { }
 
@@ -63,15 +63,14 @@ export class Sash {
 	private _onDidEnd = new Emitter<void>();
 
 	constructor(container: HTMLElement, layoutProvider: ISashLayoutProvider, options: ISashOptions = {}) {
-
 		this.$e = $('.monaco-sash').appendTo(container);
 
 		if (isMacintosh) {
 			this.$e.addClass('mac');
 		}
 
-		this.$e.on(DOM.EventType.MOUSE_DOWN, (e) => { this.onMouseDown(e as MouseEvent); });
-		this.$e.on(DOM.EventType.DBLCLICK, (e) => this._onDidReset.fire());
+		this.$e.on(DOMEventType.MOUSE_DOWN, (e) => { this.onMouseDown(e as MouseEvent); });
+		this.$e.on(DOMEventType.DBLCLICK, (e) => this._onDidReset.fire());
 		Gesture.addTarget(this.$e.getHTMLElement());
 		this.$e.on(EventType.Start, (e) => { this.onTouchStart(e as GestureEvent); });
 
@@ -127,13 +126,13 @@ export class Sash {
 	}
 
 	private onMouseDown(e: MouseEvent): void {
-		DOM.EventHelper.stop(e, false);
+		EventHelper.stop(e, false);
 
 		if (this.isDisabled) {
 			return;
 		}
 
-		const iframes = $(DOM.getElementsByTagName('iframe'));
+		const iframes = $(getElementsByTagName('iframe'));
 		if (iframes) {
 			iframes.style('pointer-events', 'none'); // disable mouse events on iframes as long as we drag the sash
 		}
@@ -157,7 +156,7 @@ export class Sash {
 		const $window = $(window);
 
 		// fix https://github.com/Microsoft/vscode/issues/21675
-		const globalStyle = DOM.createStyleSheet(this.$e.getHTMLElement());
+		const globalStyle = createStyleSheet(this.$e.getHTMLElement());
 		if (this.orientation === Orientation.HORIZONTAL) {
 			globalStyle.innerHTML = `* { cursor: ${isMacintosh ? 'row-resize' : 'ns-resize'}; }`;
 		} else {
@@ -165,7 +164,7 @@ export class Sash {
 		}
 
 		$window.on('mousemove', (e) => {
-			DOM.EventHelper.stop(e, false);
+			EventHelper.stop(e, false);
 			const mouseMoveEvent = new StandardMouseEvent(e as MouseEvent);
 
 			const event: ISashEvent = {
@@ -178,7 +177,7 @@ export class Sash {
 
 			this._onDidChange.fire(event);
 		}).once('mouseup', (e) => {
-			DOM.EventHelper.stop(e, false);
+			EventHelper.stop(e, false);
 
 			this.$e.getHTMLElement().removeChild(globalStyle);
 
@@ -187,7 +186,7 @@ export class Sash {
 
 			$window.off('mousemove');
 
-			const iframes = $(DOM.getElementsByTagName('iframe'));
+			const iframes = $(getElementsByTagName('iframe'));
 			if (iframes) {
 				iframes.style('pointer-events', 'auto');
 			}
@@ -195,7 +194,7 @@ export class Sash {
 	}
 
 	private onTouchStart(event: GestureEvent): void {
-		DOM.EventHelper.stop(event);
+		EventHelper.stop(event);
 
 		const listeners: IDisposable[] = [];
 
@@ -212,7 +211,7 @@ export class Sash {
 			altKey
 		});
 
-		listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.Change, (event: GestureEvent) => {
+		listeners.push(addDisposableListener(this.$e.getHTMLElement(), EventType.Change, (event: GestureEvent) => {
 			if (types.isNumber(event.pageX) && types.isNumber(event.pageY)) {
 				this._onDidChange.fire({
 					startX: startX,
@@ -224,7 +223,7 @@ export class Sash {
 			}
 		}));
 
-		listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.End, (event: GestureEvent) => {
+		listeners.push(addDisposableListener(this.$e.getHTMLElement(), EventType.End, (event: GestureEvent) => {
 			this._onDidEnd.fire();
 			dispose(listeners);
 		}));
@@ -301,7 +300,6 @@ export class Sash {
  * Triggers onPositionChange event when the position is changed
  */
 export class VSash extends Disposable implements IVerticalSashLayoutProvider {
-
 	private sash: Sash;
 	private ratio: number;
 	private startPosition: number;
@@ -313,6 +311,7 @@ export class VSash extends Disposable implements IVerticalSashLayoutProvider {
 
 	constructor(container: HTMLElement, private minWidth: number) {
 		super();
+
 		this.ratio = 0.5;
 		this.sash = new Sash(container, this);
 
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index db1c64ffd53..dfdab38d45c 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -8,7 +8,6 @@
 import 'vs/css!./toolbar';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionBar, ActionsOrientation, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextMenuProvider, DropdownMenuActionItem } from 'vs/base/browser/ui/dropdown/dropdown';
@@ -45,7 +44,7 @@ export class ToolBar {
 		element.className = 'monaco-toolbar';
 		container.appendChild(element);
 
-		this.actionBar = new ActionBar($(element), {
+		this.actionBar = new ActionBar(element, {
 			orientation: options.orientation,
 			ariaLabel: options.ariaLabel,
 			actionRunner: options.actionRunner,
@@ -94,7 +93,7 @@ export class ToolBar {
 		}
 	}
 
-	public getContainer(): Builder {
+	public getContainer(): HTMLElement {
 		return this.actionBar.getContainer();
 	}
 
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
index 2c7e62ed4e9..53a84d50876 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
@@ -12,8 +12,8 @@ import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
 import { IQuickNavigateConfiguration, IAutoFocus, IEntryRunContext, IModel, Mode, IKeyMods } from 'vs/base/parts/quickopen/common/quickOpen';
 import { Filter, Renderer, DataSource, IModelProvider, AccessibilityProvider } from 'vs/base/parts/quickopen/browser/quickOpenViewer';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
-import { ISelectionEvent, IFocusEvent, ITree, ContextMenuEvent, IActionProvider, ITreeStyles, ITreeOptions, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
+import { Builder, $ } from 'vs/base/browser/builder';
+import { ITree, ContextMenuEvent, IActionProvider, ITreeStyles, ITreeOptions, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
 import { InputBox, MessageType, IInputBoxStyles, IRange } from 'vs/base/browser/ui/inputbox/inputBox';
 import Severity from 'vs/base/common/severity';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
@@ -113,7 +113,7 @@ export class QuickOpenWidget implements IModelProvider {
 	private container: HTMLElement;
 	private treeElement: HTMLElement;
 	private inputElement: HTMLElement;
-	private layoutDimensions: Dimension;
+	private layoutDimensions: DOM.Dimension;
 	private model: IModel<any>;
 	private inputChangingTimeoutHandle: number;
 	private styles: IQuickOpenStyles;
@@ -130,8 +130,8 @@ export class QuickOpenWidget implements IModelProvider {
 		this.model = null;
 	}
 
-	public getElement(): Builder {
-		return $(this.builder);
+	public getElement(): HTMLElement {
+		return $(this.builder).getHTMLElement();
 	}
 
 	public getModel(): IModel<any> {
@@ -143,10 +143,10 @@ export class QuickOpenWidget implements IModelProvider {
 	}
 
 	public create(): HTMLElement {
-		this.builder = $().div((div: Builder) => {
+		this.builder = $().div(div => {
 
 			// Eventing
-			div.on(DOM.EventType.KEY_DOWN, (e) => {
+			div.on(DOM.EventType.KEY_DOWN, e => {
 				const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
 				if (keyboardEvent.keyCode === KeyCode.Escape) {
 					DOM.EventHelper.stop(e, true);
@@ -160,10 +160,10 @@ export class QuickOpenWidget implements IModelProvider {
 
 			// Progress Bar
 			this.progressBar = new ProgressBar(div.clone(), { progressBarBackground: this.styles.progressBarBackground });
-			this.progressBar.getContainer().hide();
+			this.progressBar.hide();
 
 			// Input Field
-			div.div({ 'class': 'quick-open-input' }, (inputContainer) => {
+			div.div({ 'class': 'quick-open-input' }, inputContainer => {
 				this.inputContainer = inputContainer;
 				this.inputBox = new InputBox(inputContainer.getHTMLElement(), null, {
 					placeholder: this.options.inputPlaceHolder || '',
@@ -226,7 +226,7 @@ export class QuickOpenWidget implements IModelProvider {
 			// Tree
 			this.treeContainer = div.div({
 				'class': 'quick-open-tree'
-			}, (div: Builder) => {
+			}, div => {
 				const createTree = this.options.treeCreator || ((container, config, opts) => new Tree(container, config, opts));
 
 				this.tree = createTree(div.getHTMLElement(), {
@@ -249,11 +249,11 @@ export class QuickOpenWidget implements IModelProvider {
 				this.treeElement = this.tree.getHTMLElement();
 
 				// Handle Focus and Selection event
-				this.toUnbind.push(this.tree.onDidChangeFocus((event: IFocusEvent) => {
+				this.toUnbind.push(this.tree.onDidChangeFocus(event => {
 					this.elementFocused(event.focus, event);
 				}));
 
-				this.toUnbind.push(this.tree.onDidChangeSelection((event: ISelectionEvent) => {
+				this.toUnbind.push(this.tree.onDidChangeSelection(event => {
 					if (event.selection && event.selection.length > 0) {
 						const mouseEvent: StandardMouseEvent = event.payload && event.payload.originalEvent instanceof StandardMouseEvent ? event.payload.originalEvent : void 0;
 						const shouldOpenInBackground = mouseEvent ? this.shouldOpenInBackground(mouseEvent) : false;
@@ -262,7 +262,7 @@ export class QuickOpenWidget implements IModelProvider {
 					}
 				}));
 			}).
-				on(DOM.EventType.KEY_DOWN, (e) => {
+				on(DOM.EventType.KEY_DOWN, e => {
 					const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
 
 					// Only handle when in quick navigation mode
@@ -277,7 +277,7 @@ export class QuickOpenWidget implements IModelProvider {
 						this.navigateInTree(keyboardEvent.keyCode);
 					}
 				}).
-				on(DOM.EventType.KEY_UP, (e) => {
+				on(DOM.EventType.KEY_UP, e => {
 					const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
 					const keyCode = keyboardEvent.keyCode;
 
@@ -288,7 +288,7 @@ export class QuickOpenWidget implements IModelProvider {
 
 					// Select element when keys are pressed that signal it
 					const quickNavKeys = this.quickNavigateConfiguration.keybindings;
-					const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some((k) => {
+					const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some(k => {
 						const [firstPart, chordPart] = k.getParts();
 						if (chordPart) {
 							return false;
@@ -780,7 +780,7 @@ export class QuickOpenWidget implements IModelProvider {
 		this.treeContainer.style({ height: (this.options.minItemsToShow ? this.options.minItemsToShow * 22 : 0) + 'px' });
 
 		// Clear any running Progress
-		this.progressBar.stop().getContainer().hide();
+		this.progressBar.stop().hide();
 
 		// Clear Focus
 		if (this.tree.isDOMFocused()) {
@@ -921,7 +921,7 @@ export class QuickOpenWidget implements IModelProvider {
 		return this.visible;
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		this.layoutDimensions = dimension;
 
 		// Apply to quick open width (height is dynamic by number of items to show)
diff --git a/src/vs/base/test/browser/builder.test.ts b/src/vs/base/test/browser/builder.test.ts
index 3760b3e0885..9184eff6ac1 100644
--- a/src/vs/base/test/browser/builder.test.ts
+++ b/src/vs/base/test/browser/builder.test.ts
@@ -5,12 +5,25 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Build, Builder, MultiBuilder, $, bindElement, withElement, setPropertyOnElement, getPropertyFromElement } from 'vs/base/browser/builder';
+import { Builder, MultiBuilder, $, bindElement, withElement, setPropertyOnElement, getPropertyFromElement } from 'vs/base/browser/builder';
 import * as Types from 'vs/base/common/types';
 import * as DomUtils from 'vs/base/browser/dom';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { timeout } from 'vs/base/common/async';
 
+function withElementById(id: string, offdom?: boolean): Builder {
+	let element = document.getElementById(id);
+	if (element) {
+		return new Builder(element, offdom);
+	}
+
+	return null;
+}
+
+const Build = {
+	withElementById: withElementById
+};
+
 let withElementsBySelector = function (selector: string, offdom: boolean = false) {
 	let elements = window.document.querySelectorAll(selector);
 
diff --git a/src/vs/base/test/browser/progressBar.test.ts b/src/vs/base/test/browser/progressBar.test.ts
index 3d4423ac1ef..00e7b2e487b 100644
--- a/src/vs/base/test/browser/progressBar.test.ts
+++ b/src/vs/base/test/browser/progressBar.test.ts
@@ -6,7 +6,6 @@
 
 import * as assert from 'assert';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { Builder } from 'vs/base/browser/builder';
 
 suite('ProgressBar', () => {
 	let fixture: HTMLElement;
@@ -21,10 +20,7 @@ suite('ProgressBar', () => {
 	});
 
 	test('Progress Bar', function () {
-		const b = new Builder(fixture);
-
-		const bar = new ProgressBar(b);
-		assert(bar.getContainer());
+		const bar = new ProgressBar(fixture);
 		assert(bar.infinite());
 		assert(bar.total(100));
 		assert(bar.worked(50));
diff --git a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
index 593f6b9e3fd..6c7a42c84aa 100644
--- a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
@@ -133,7 +133,7 @@ export abstract class PeekViewWidget extends ZoneWidget {
 
 		const actionsContainer = $('.peekview-actions').appendTo(this._headElement);
 		const actionBarOptions = this._getActionBarOptions();
-		this._actionbarWidget = new ActionBar(actionsContainer, actionBarOptions);
+		this._actionbarWidget = new ActionBar(actionsContainer.getHTMLElement(), actionBarOptions);
 		this._disposables.push(this._actionbarWidget);
 
 		this._actionbarWidget.push(new Action('peekview.close', nls.localize('label.close', "Close"), 'close-peekview-action', true, () => {
diff --git a/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts b/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts
index c8b3d511cd3..7eade63fcd7 100644
--- a/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { $, Dimension } from 'vs/base/browser/builder';
 import { QuickOpenModel } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { QuickOpenWidget } from 'vs/base/parts/quickopen/browser/quickOpenWidget';
 import { IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen';
@@ -13,6 +12,7 @@ import { attachQuickOpenStyler } from 'vs/platform/theme/common/styler';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { foreground } from 'vs/platform/theme/common/colorRegistry';
+import { Dimension } from 'vs/base/browser/dom';
 
 export interface IQuickOpenEditorWidgetOptions {
 	inputAriaLabel: string;
@@ -37,7 +37,7 @@ export class QuickOpenEditorWidget implements IOverlayWidget {
 	}
 
 	private create(onOk: () => void, onCancel: () => void, onType: (value: string) => void, configuration: IQuickOpenEditorWidgetOptions): void {
-		this.domNode = $().div().getHTMLElement();
+		this.domNode = document.createElement('div');
 
 		this.quickOpenWidget = new QuickOpenWidget(
 			this.domNode,
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index 0e85d241b4f..e540070611e 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Dimension, Builder } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Component } from 'vs/workbench/common/component';
@@ -14,8 +14,8 @@ import { IEditorControl } from 'vs/platform/editor/common/editor';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import * as DOM from 'vs/base/browser/dom';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { IFocusTracker, trackFocus, Dimension } from 'vs/base/browser/dom';
 
 /**
  * Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
@@ -31,7 +31,7 @@ export abstract class Composite extends Component implements IComposite {
 	private readonly _onTitleAreaUpdate: Emitter<void>;
 	private readonly _onDidFocus: Emitter<void>;
 
-	private _focusTracker?: DOM.IFocusTracker;
+	private _focusTracker?: IFocusTracker;
 	private _focusListenerDisposable?: IDisposable;
 
 	private visible: boolean;
@@ -93,7 +93,7 @@ export abstract class Composite extends Component implements IComposite {
 	}
 
 	public get onDidFocus(): Event<any> {
-		this._focusTracker = DOM.trackFocus(this.getContainer().getHTMLElement());
+		this._focusTracker = trackFocus(this.getContainer().getHTMLElement());
 		this._focusListenerDisposable = this._focusTracker.onDidFocus(() => {
 			this._onDidFocus.fire();
 		});
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 620b755fefb..516f874935a 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import { Part } from 'vs/workbench/browser/part';
@@ -23,6 +22,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { memoize } from 'vs/base/common/decorators';
 import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
 import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
+import { Dimension, getClientArea } from 'vs/base/browser/dom';
 
 const MIN_SIDEBAR_PART_WIDTH = 170;
 const DEFAULT_SIDEBAR_PART_WIDTH = 300;
@@ -59,8 +59,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 	private static readonly sashYHeightSettingsKey = 'workbench.panel.height';
 	private static readonly panelSizeBeforeMaximizedKey = 'workbench.panel.sizeBeforeMaximized';
 
-	private parent: Builder;
-	private workbenchContainer: Builder;
+	private parent: HTMLElement;
+	private workbenchContainer: HTMLElement;
 	private titlebar: Part;
 	private activitybar: Part;
 	private editor: Part;
@@ -88,8 +88,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 
 	// Take parts as an object bag since instatation service does not have typings for constructors with 9+ arguments
 	constructor(
-		parent: Builder,
-		workbenchContainer: Builder,
+		parent: HTMLElement,
+		workbenchContainer: HTMLElement,
 		parts: {
 			titlebar: Part,
 			activitybar: Part,
@@ -126,15 +126,15 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		this.panelSizeBeforeMaximized = this.storageService.getInteger(WorkbenchLayout.panelSizeBeforeMaximizedKey, StorageScope.GLOBAL, 0);
 		this.panelMaximized = false;
 
-		this.sashXOne = new Sash(this.workbenchContainer.getHTMLElement(), this, {
+		this.sashXOne = new Sash(this.workbenchContainer, this, {
 			baseSize: 5
 		});
 
-		this.sashXTwo = new Sash(this.workbenchContainer.getHTMLElement(), this, {
+		this.sashXTwo = new Sash(this.workbenchContainer, this, {
 			baseSize: 5
 		});
 
-		this.sashY = new Sash(this.workbenchContainer.getHTMLElement(), this, {
+		this.sashY = new Sash(this.workbenchContainer, this, {
 			baseSize: 4,
 			orientation: Orientation.HORIZONTAL
 		});
@@ -447,7 +447,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 	}
 
 	public layout(options?: ILayoutOptions): void {
-		this.workbenchSize = this.parent.getClientArea();
+		this.workbenchSize = getClientArea(this.parent);
 
 		const isActivityBarHidden = !this.partService.isVisible(Parts.ACTIVITYBAR_PART);
 		const isTitlebarHidden = !this.partService.isVisible(Parts.TITLEBAR_PART);
@@ -578,12 +578,17 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		}
 
 		// Workbench
-		this.workbenchContainer
-			.position(0, 0, 0, 0, 'relative')
-			.size(this.workbenchSize.width, this.workbenchSize.height);
+		this.workbenchContainer.style.top = '0px';
+		this.workbenchContainer.style.right = '0px';
+		this.workbenchContainer.style.bottom = '0px';
+		this.workbenchContainer.style.left = '0px';
+		this.workbenchContainer.style.position = 'relative';
+
+		this.workbenchContainer.style.width = `${this.workbenchSize.width}px`;
+		this.workbenchContainer.style.height = `${this.workbenchSize.height}px`;
 
 		// Bug on Chrome: Sometimes Chrome wants to scroll the workbench container on layout changes. The fix is to reset scrolling in this case.
-		const workbenchContainer = this.workbenchContainer.getHTMLElement();
+		const workbenchContainer = this.workbenchContainer;
 		if (workbenchContainer.scrollTop > 0) {
 			workbenchContainer.scrollTop = 0;
 		}
diff --git a/src/vs/workbench/browser/part.ts b/src/vs/workbench/browser/part.ts
index 007441d57dc..2fa675fe4c7 100644
--- a/src/vs/workbench/browser/part.ts
+++ b/src/vs/workbench/browser/part.ts
@@ -6,9 +6,10 @@
 'use strict';
 
 import 'vs/css!./media/part';
-import { Dimension, Builder } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { Component } from 'vs/workbench/common/component';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
+import { Dimension } from 'vs/base/browser/dom';
 
 export interface IPartOptions {
 	hasTitle?: boolean;
@@ -104,8 +105,7 @@ const TITLE_HEIGHT = 35;
 
 export class PartLayout {
 
-	constructor(container: Builder, private options: IPartOptions, titleArea: Builder, private contentArea: Builder) {
-	}
+	constructor(container: Builder, private options: IPartOptions, titleArea: Builder, private contentArea: Builder) { }
 
 	public layout(dimension: Dimension): Dimension[] {
 		const { width, height } = dimension;
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index d4d5cc0e00c..db68639288e 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -9,7 +9,7 @@ import 'vs/css!./media/activitybarpart';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { illegalArgument } from 'vs/base/common/errors';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { Action } from 'vs/base/common/actions';
 import { ActionsOrientation, ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { GlobalActivityExtensions, IGlobalActivityRegistry } from 'vs/workbench/common/activity';
@@ -31,7 +31,7 @@ import { CompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeB
 import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
 import { isMacintosh } from 'vs/base/common/platform';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
+import { Dimension, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
 import { Color } from 'vs/base/common/color';
 
 export class ActivitybarPart extends Part {
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index a209aeada4f..da608b7abb9 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -10,18 +10,17 @@ import * as nls from 'vs/nls';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import * as strings from 'vs/base/common/strings';
 import { Emitter } from 'vs/base/common/event';
 import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
-import * as DOM from 'vs/base/browser/dom';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 import { IActionItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { prepareActions } from 'vs/workbench/browser/actions';
-import { Action, IAction, IRunEvent } from 'vs/base/common/actions';
+import { Action, IAction } from 'vs/base/common/actions';
 import { Part, IPartOptions } from 'vs/workbench/browser/part';
 import { Composite, CompositeRegistry } from 'vs/workbench/browser/composite';
 import { IComposite } from 'vs/workbench/common/composite';
@@ -37,6 +36,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension, EventType } from 'vs/base/browser/dom';
 
 export interface ICompositeTitleLabel {
 
@@ -223,7 +223,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			compositeContainer = $().div({
 				'class': ['composite', this.compositeCSSClass],
 				id: composite.getId()
-			}, (div: Builder) => {
+			}, div => {
 				createCompositePromise = composite.create(div).then(() => {
 					composite.updateStyles();
 				});
@@ -279,7 +279,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			}
 
 			// Action Run Handling
-			this.telemetryActionsListener = this.toolBar.actionRunner.onDidRun((e: IRunEvent) => {
+			this.telemetryActionsListener = this.toolBar.actionRunner.onDidRun(e => {
 
 				// Check for Error
 				if (e.error && !errors.isPromiseCanceledError(e.error)) {
@@ -311,7 +311,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 					composite.layout(this.contentAreaSize);
 				}
 			});
-		}, (error: any) => this.onError(error));
+		}, error => this.onError(error));
 	}
 
 	protected onTitleAreaUpdate(compositeId: string): void {
@@ -391,7 +391,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			compositeContainer.hide();
 
 			// Clear any running Progress
-			this.progressBar.stop().getContainer().hide();
+			this.progressBar.stop().hide();
 
 			// Empty Actions
 			this.toolBar.setActions([])();
@@ -408,7 +408,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			'class': ['composite', 'title']
 		});
 
-		$(titleArea).on(DOM.EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)));
+		$(titleArea).on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)));
 
 		// Left Title Label
 		this.titleLabel = this.createTitleLabel(titleArea);
@@ -416,13 +416,13 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		// Right Actions Container
 		$(titleArea).div({
 			'class': 'title-actions'
-		}, (div) => {
+		}, div => {
 
 			// Toolbar
 			this.toolBar = new ToolBar(div.getHTMLElement(), this.contextMenuService, {
-				actionItemProvider: (action: Action) => this.actionItemProvider(action),
+				actionItemProvider: action => this.actionItemProvider(action as Action),
 				orientation: ActionsOrientation.HORIZONTAL,
-				getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id)
+				getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id)
 			});
 		});
 
@@ -433,7 +433,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		let titleLabel: Builder;
 		$(parent).div({
 			'class': 'title-label'
-		}, (div) => {
+		}, div => {
 			titleLabel = div.span();
 		});
 
@@ -464,9 +464,9 @@ export abstract class CompositePart<T extends Composite> extends Part {
 				this.contextMenuService.showContextMenu({
 					getAnchor: () => anchor,
 					getActions: () => TPromise.as(contextMenuActions),
-					getActionItem: (action: Action) => this.actionItemProvider(action),
+					getActionItem: action => this.actionItemProvider(action as Action),
 					actionRunner: this.activeComposite.getActionRunner(),
-					getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id)
+					getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id)
 				});
 			}
 		}
@@ -477,6 +477,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 	}
 
 	private actionItemProvider(action: Action): IActionItem {
+
 		// Check Active Composite
 		if (this.activeComposite) {
 			return this.activeComposite.getActionItem(action);
@@ -488,10 +489,10 @@ export abstract class CompositePart<T extends Composite> extends Part {
 	public createContentArea(parent: Builder): Builder {
 		return $(parent).div({
 			'class': 'content'
-		}, (div: Builder) => {
-			this.progressBar = new ProgressBar(div);
+		}, div => {
+			this.progressBar = new ProgressBar(div.getHTMLElement());
 			this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
-			this.progressBar.getContainer().hide();
+			this.progressBar.hide();
 		});
 	}
 
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
index 55712a8d842..6b6e3cd458d 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
@@ -8,9 +8,7 @@
 import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { illegalArgument } from 'vs/base/common/errors';
-import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
-import { Dimension } from 'vs/base/browser/builder';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -19,6 +17,7 @@ import { ActionBar, IActionItem, ActionsOrientation } from 'vs/base/browser/ui/a
 import { Event, Emitter } from 'vs/base/common/event';
 import { CompositeActionItem, CompositeOverflowActivityAction, ICompositeActivity, CompositeOverflowActivityActionItem, ActivityAction, ICompositeBar, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Dimension, $, addDisposableListener, EventType, EventHelper } from 'vs/base/browser/dom';
 
 export interface ICompositeBarOptions {
 	icon: boolean;
@@ -203,7 +202,7 @@ export class CompositeBar implements ICompositeBar {
 	}
 
 	public create(parent: HTMLElement): HTMLElement {
-		const actionBarDiv = parent.appendChild(dom.$('.composite-bar'));
+		const actionBarDiv = parent.appendChild($('.composite-bar'));
 		this.compositeSwitcherBar = new ActionBar(actionBarDiv, {
 			actionItemProvider: (action: Action) => action instanceof CompositeOverflowActivityAction ? this.compositeOverflowActionItem : this.compositeIdToActionItems[action.id],
 			orientation: this.options.orientation,
@@ -213,16 +212,16 @@ export class CompositeBar implements ICompositeBar {
 		this.toDispose.push(this.compositeSwitcherBar);
 
 		// Contextmenu for composites
-		this.toDispose.push(dom.addDisposableListener(parent, dom.EventType.CONTEXT_MENU, (e: MouseEvent) => {
-			dom.EventHelper.stop(e, true);
+		this.toDispose.push(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => {
+			EventHelper.stop(e, true);
 			this._onDidContextMenu.fire(e);
 		}));
 
 		// Allow to drop at the end to move composites to the end
-		this.toDispose.push(dom.addDisposableListener(parent, dom.EventType.DROP, (e: DragEvent) => {
+		this.toDispose.push(addDisposableListener(parent, EventType.DROP, (e: DragEvent) => {
 			const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
 			if (draggedCompositeId) {
-				dom.EventHelper.stop(e, true);
+				EventHelper.stop(e, true);
 				CompositeActionItem.clearDraggedComposite();
 
 				const targetId = this.pinnedComposites[this.pinnedComposites.length - 1];
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
index 6fb75715ca3..13ceb5abbbf 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
@@ -193,7 +193,7 @@ export class ActivityActionItem extends BaseActionItem {
 			this.$label.text(this.getAction().label);
 		}
 
-		this.$badge = this.builder.clone().div({ 'class': 'badge' }, (badge: Builder) => {
+		this.$badge = this.builder.clone().div({ 'class': 'badge' }, badge => {
 			this.$badgeContent = badge.div({ 'class': 'badge-content' });
 		});
 
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 8bf0f08c6b5..e50946ef3ad 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -8,7 +8,7 @@
 import * as nls from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
@@ -18,6 +18,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ResourceViewerContext, ResourceViewer } from 'vs/workbench/browser/parts/editor/resourceViewer';
 import URI from 'vs/base/common/uri';
+import { Dimension } from 'vs/base/browser/dom';
 
 export interface IOpenCallbacks {
 	openInternal: (input: EditorInput, options: EditorOptions) => void;
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
index f647428e7f9..26779caaa6e 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -10,7 +10,7 @@ import * as arrays from 'vs/base/common/arrays';
 import { Event, Emitter } from 'vs/base/common/event';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import * as types from 'vs/base/common/types';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -74,7 +74,7 @@ export interface IEditorGroupsControl {
 	updateProgress(position: Position, state: ProgressState): void;
 	updateTitleAreas(refreshActive?: boolean): void;
 
-	layout(dimension: Dimension): void;
+	layout(dimension: DOM.Dimension): void;
 	layout(position: Position): void;
 
 	arrangeGroups(arrangement: GroupArrangement): void;
@@ -119,7 +119,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 	private stacks: IEditorStacksModel;
 
 	private parent: Builder;
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 	private dragging: boolean;
 
 	private layoutVertically: boolean;
@@ -185,7 +185,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.stacks = editorGroupService.getStacksModel();
 
 		this.parent = parent;
-		this.dimension = new Dimension(0, 0);
+		this.dimension = new DOM.Dimension(0, 0);
 
 		this.silos = [];
 		this.silosSize = [];
@@ -1031,9 +1031,9 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.createTitleControl(this.stacks.groupAt(position), silo, titleContainer, instantiationService);
 
 		// Progress Bar
-		const progressBar = new ProgressBar($(container));
+		const progressBar = new ProgressBar(container.getHTMLElement());
 		this.toUnbind.push(attachProgressBarStyler(progressBar, this.themeService));
-		progressBar.getContainer().hide();
+		progressBar.hide();
 		container.setProperty(EditorGroupsControl.PROGRESS_BAR_CONTROL_KEY, progressBar); // associate with container
 
 		// Sash for first position to support centered editor layout
@@ -2011,17 +2011,17 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		return this.dragging;
 	}
 
-	public layout(dimension: Dimension): void;
+	public layout(dimension: DOM.Dimension): void;
 	public layout(position: Position): void;
 	public layout(arg: any): void {
-		if (arg instanceof Dimension) {
-			this.layoutControl(<Dimension>arg);
+		if (arg instanceof DOM.Dimension) {
+			this.layoutControl(<DOM.Dimension>arg);
 		} else {
 			this.layoutEditor(<Position>arg);
 		}
 	}
 
-	private layoutControl(dimension: Dimension): void {
+	private layoutControl(dimension: DOM.Dimension): void {
 		let oldDimension = this.dimension;
 		this.dimension = dimension;
 
@@ -2176,7 +2176,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 	private layoutTitleControl(position: Position): void {
 		const siloWidth = this.layoutVertically ? this.silosSize[position] : this.dimension.width;
 
-		this.getTitleAreaControl(position).layout(new Dimension(siloWidth, EditorGroupsControl.EDITOR_TITLE_HEIGHT));
+		this.getTitleAreaControl(position).layout(new DOM.Dimension(siloWidth, EditorGroupsControl.EDITOR_TITLE_HEIGHT));
 	}
 
 	private layoutEditor(position: Position): void {
@@ -2204,7 +2204,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 			editorContainer.style('margin-left', this.centeredEditorActive ? `${editorPosition}px` : null);
 			editorContainer.style('width', this.centeredEditorActive ? `${editorWidth}px` : null);
 			editorContainer.style('border-color', this.centeredEditorActive ? this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder) : null);
-			editor.layout(new Dimension(editorWidth, editorHeight));
+			editor.layout(new DOM.Dimension(editorWidth, editorHeight));
 		}
 	}
 
@@ -2269,13 +2269,13 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 		switch (state) {
 			case ProgressState.INFINITE:
-				progressbar.infinite().getContainer().show();
+				progressbar.infinite().show();
 				break;
 			case ProgressState.DONE:
-				progressbar.done().getContainer().hide();
+				progressbar.done().hide();
 				break;
 			case ProgressState.STOP:
-				progressbar.stop().getContainer().hide();
+				progressbar.stop().hide();
 				break;
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 86c952e038e..97e25171b1a 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -9,7 +9,7 @@ import 'vs/css!./media/editorpart';
 import 'vs/workbench/browser/parts/editor/editor.contribution';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import * as nls from 'vs/nls';
 import * as strings from 'vs/base/common/strings';
 import * as arrays from 'vs/base/common/arrays';
@@ -40,7 +40,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { EDITOR_GROUP_BACKGROUND } from 'vs/workbench/common/theme';
-import { createCSSRule } from 'vs/base/browser/dom';
+import { createCSSRule, Dimension } from 'vs/base/browser/dom';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { join } from 'vs/base/common/paths';
 import { IEditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
index 6b0144487c7..948465e40ae 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -88,7 +88,7 @@ export class NoTabsTitleControl extends TitleControl {
 		// - click on toolbar: should trigger actions within
 		// - mouse click: do not focus group if there are more than one as it otherwise makes group DND funky
 		// - touch: always focus
-		else if ((this.stacks.groups.length === 1 || !(e instanceof MouseEvent)) && !DOM.isAncestor(((e as GestureEvent).initialTarget || e.target || e.srcElement) as HTMLElement, this.editorActionsToolbar.getContainer().getHTMLElement())) {
+		else if ((this.stacks.groups.length === 1 || !(e instanceof MouseEvent)) && !DOM.isAncestor(((e as GestureEvent).initialTarget || e.target || e.srcElement) as HTMLElement, this.editorActionsToolbar.getContainer())) {
 			this.editorGroupService.focusGroup(group);
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index ed753b69240..973506ff5c7 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -10,7 +10,7 @@ import * as nls from 'vs/nls';
 import * as mimes from 'vs/base/common/mime';
 import URI from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import * as DOM from 'vs/base/browser/dom';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { LRUCache } from 'vs/base/common/map';
@@ -119,7 +119,7 @@ class BinarySize {
 }
 
 export interface ResourceViewerContext {
-	layout(dimension: Dimension): void;
+	layout(dimension: DOM.Dimension): void;
 }
 
 /**
@@ -440,7 +440,7 @@ class InlineImageView {
 		metadataClb: (meta: string) => void
 	) {
 		const context = {
-			layout(dimension: Dimension) { }
+			layout(dimension: DOM.Dimension) { }
 		};
 
 		const cacheKey = descriptor.resource.toString();
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index fd414145054..d2e082c1d86 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -5,14 +5,12 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
-import { Dimension, Builder } from 'vs/base/browser/builder';
-
+import { Builder } from 'vs/base/browser/builder';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorInput, EditorOptions, SideBySideEditorInput } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorControl, Position, IEditor } from 'vs/platform/editor/common/editor';
 import { VSash } from 'vs/base/browser/ui/sash/sash';
-
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -23,7 +21,7 @@ export class SideBySideEditor extends BaseEditor {
 
 	public static readonly ID: string = 'workbench.editor.sidebysideEditor';
 
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 
 	protected masterEditor: BaseEditor;
 	private masterEditorContainer: HTMLElement;
@@ -90,7 +88,7 @@ export class SideBySideEditor extends BaseEditor {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		this.dimension = dimension;
 		this.sash.setDimenesion(this.dimension);
 	}
@@ -188,8 +186,8 @@ export class SideBySideEditor extends BaseEditor {
 		this.masterEditorContainer.style.height = `${this.dimension.height}px`;
 		this.masterEditorContainer.style.left = `${splitPoint}px`;
 
-		this.detailsEditor.layout(new Dimension(detailsEditorWidth, this.dimension.height));
-		this.masterEditor.layout(new Dimension(masterEditorWidth, this.dimension.height));
+		this.detailsEditor.layout(new DOM.Dimension(detailsEditorWidth, this.dimension.height));
+		this.masterEditor.layout(new DOM.Dimension(masterEditorWidth, this.dimension.height));
 	}
 
 	private disposeEditors(): void {
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index ece29d8aec6..c436bdbd003 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -38,7 +38,6 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_BACKGROUND, WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { activeContrastBorder, contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { Dimension } from 'vs/base/browser/builder';
 import { ResourcesDropHandler, fillResourceDataTransfers, LocalSelectionTransfer, DraggedEditorIdentifier } from 'vs/workbench/browser/dnd';
 import { Color } from 'vs/base/common/color';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -60,7 +59,7 @@ export class TabsTitleControl extends TitleControl {
 	private scrollbar: ScrollableElement;
 	private tabDisposeables: IDisposable[];
 	private blockRevealActiveTab: boolean;
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 	private layoutScheduled: IDisposable;
 	private transfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
 
@@ -555,7 +554,7 @@ export class TabsTitleControl extends TitleControl {
 		return tabContainer;
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		if (!this.activeTab || !dimension) {
 			return;
 		}
@@ -573,7 +572,7 @@ export class TabsTitleControl extends TitleControl {
 		}
 	}
 
-	private doLayout(dimension: Dimension): void {
+	private doLayout(dimension: DOM.Dimension): void {
 		const visibleContainerWidth = this.tabsContainer.offsetWidth;
 		const totalContainerWidth = this.tabsContainer.scrollWidth;
 
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 2a6c3da6744..afec6d1b42f 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -8,7 +8,7 @@
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
-import { Dimension, Builder } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
@@ -219,7 +219,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 		this.editorControl.focus();
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 
 		// Pass on to Editor
 		this.editorControl.layout(dimension);
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index edcaa336ae5..d2c4dfd3adb 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -10,7 +10,6 @@ import * as nls from 'vs/nls';
 import { prepareActions } from 'vs/workbench/browser/actions';
 import { IAction, Action, IRunEvent } from 'vs/base/common/actions';
 import * as errors from 'vs/base/common/errors';
-import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { RunOnceScheduler } from 'vs/base/common/async';
@@ -36,8 +35,8 @@ import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Themable } from 'vs/workbench/common/theme';
 import { isDiffEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Dimension } from 'vs/base/browser/builder';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension, findParentWithClass } from 'vs/base/browser/dom';
 
 export interface IToolbarActions {
 	primary: IAction[];
@@ -211,7 +210,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 	}
 
 	public allowDragging(element: HTMLElement): boolean {
-		return !DOM.findParentWithClass(element, 'monaco-action-bar', 'one-editor-silo');
+		return !findParentWithClass(element, 'monaco-action-bar', 'one-editor-silo');
 	}
 
 	protected initActions(services: IInstantiationService): void {
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index 008797743bb..fc2ac1dcbdb 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -10,14 +10,13 @@ import 'vs/css!./media/notificationsActions';
 import { Themable, NOTIFICATIONS_BORDER, NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND, NOTIFICATIONS_CENTER_BORDER } from 'vs/workbench/common/theme';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { INotificationsModel, INotificationChangeEvent, NotificationChangeType } from 'vs/workbench/common/notifications';
-import { Dimension } from 'vs/base/browser/builder';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { NotificationsCenterVisibleContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { addClass, removeClass, isAncestor } from 'vs/base/browser/dom';
+import { addClass, removeClass, isAncestor, Dimension } from 'vs/base/browser/dom';
 import { widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { localize } from 'vs/nls';
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 243d2752b4b..8c1fa51b1b3 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -8,10 +8,9 @@
 import 'vs/css!./media/notificationsToasts';
 import { INotificationsModel, NotificationChangeType, INotificationChangeEvent, INotificationViewItem, NotificationViewItemLabelKind } from 'vs/workbench/common/notifications';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { addClass, removeClass, isAncestor, addDisposableListener, EventType } from 'vs/base/browser/dom';
+import { addClass, removeClass, isAncestor, addDisposableListener, EventType, Dimension } from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
-import { Dimension } from 'vs/base/browser/builder';
 import { once } from 'vs/base/common/event';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { Themable, NOTIFICATIONS_TOAST_BORDER } from 'vs/workbench/common/theme';
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 2610575458b..124588a01cf 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -456,7 +456,7 @@ export class NotificationTemplateRenderer {
 
 		// Return early if the item has no progress
 		if (!notification.hasProgress()) {
-			this.template.progress.stop().getContainer().hide();
+			this.template.progress.stop().hide();
 
 			return;
 		}
@@ -464,7 +464,7 @@ export class NotificationTemplateRenderer {
 		// Infinite
 		const state = notification.progress.state;
 		if (state.infinite) {
-			this.template.progress.infinite().getContainer().show();
+			this.template.progress.infinite().show();
 		}
 
 		// Total / Worked
@@ -474,13 +474,13 @@ export class NotificationTemplateRenderer {
 			}
 
 			if (typeof state.worked === 'number') {
-				this.template.progress.worked(state.worked).getContainer().show();
+				this.template.progress.worked(state.worked).show();
 			}
 		}
 
 		// Done
 		else {
-			this.template.progress.done().getContainer().hide();
+			this.template.progress.done().hide();
 		}
 	}
 
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index e7ff7537134..90d74fd857f 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/panelpart';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IPanel } from 'vs/workbench/common/panel';
@@ -30,6 +30,7 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension } from 'vs/base/browser/dom';
 
 export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
@@ -258,7 +259,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			return 0;
 		}
 		if (!this.toolbarWidth.has(activePanel.getId())) {
-			this.toolbarWidth.set(activePanel.getId(), this.toolBar.getContainer().getHTMLElement().offsetWidth);
+			this.toolbarWidth.set(activePanel.getId(), this.toolBar.getContainer().offsetWidth);
 		}
 
 		return this.toolbarWidth.get(activePanel.getId());
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index daac7a7795d..8d4d6642e47 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -9,7 +9,6 @@ import 'vs/css!./quickInput';
 import { Component } from 'vs/workbench/common/component';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { Dimension } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -41,7 +40,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private static readonly ID = 'workbench.component.quickinput';
 	private static readonly MAX_WIDTH = 600;				// Max total width of quick open widget
 
-	private layoutDimensions: Dimension;
+	private layoutDimensions: dom.Dimension;
 	private container: HTMLElement;
 	private checkAll: HTMLInputElement;
 	private inputBox: QuickInputBox;
@@ -124,7 +123,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		}));
 
 		this.progressBar = new ProgressBar(this.container);
-		this.progressBar.getContainer().addClass('quick-input-progress');
+		dom.addClass(this.progressBar.getContainer(), 'quick-input-progress');
 		this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
 
 		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
@@ -259,7 +258,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		return result;
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		this.layoutDimensions = dimension;
 		this.updateLayout();
 	}
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 28896b52a38..da5281628c2 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -9,9 +9,7 @@ import 'vs/css!./media/quickopen';
 import { TPromise, ValueCallback } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as browser from 'vs/base/browser/browser';
-import { Dimension, withElementById } from 'vs/base/browser/builder';
 import * as strings from 'vs/base/common/strings';
-import * as DOM from 'vs/base/browser/dom';
 import URI from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
@@ -57,6 +55,7 @@ import { IMatch } from 'vs/base/common/filters';
 import { Schemas } from 'vs/base/common/network';
 import Severity from 'vs/base/common/severity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension, addClass } from 'vs/base/browser/dom';
 
 const HELP_PREFIX = '?';
 
@@ -302,7 +301,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		// Create upon first open
 		if (!this.pickOpenWidget) {
 			this.pickOpenWidget = new QuickOpenWidget(
-				withElementById(this.partService.getWorkbenchElementId()).getHTMLElement(),
+				document.getElementById(this.partService.getWorkbenchElementId()),
 				{
 					onOk: () => { /* ignore, handle later */ },
 					onCancel: () => { /* ignore, handle later */ },
@@ -318,7 +317,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			this.toUnbind.push(attachQuickOpenStyler(this.pickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
 
 			const pickOpenContainer = this.pickOpenWidget.create();
-			DOM.addClass(pickOpenContainer, 'show-file-icons');
+			addClass(pickOpenContainer, 'show-file-icons');
 			this.positionQuickOpenWidget();
 		}
 
@@ -374,7 +373,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 				picksPromiseDone = true;
 
 				// Reset Progress
-				this.pickOpenWidget.getProgressBar().stop().getContainer().hide();
+				this.pickOpenWidget.getProgressBar().stop().hide();
 
 				// Model
 				const model = new QuickOpenModel([], new PickOpenActionProvider());
@@ -487,7 +486,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			// Progress if task takes a long time
 			TPromise.timeout(800).then(() => {
 				if (!picksPromiseDone && this.currentPickerToken === currentPickerToken) {
-					this.pickOpenWidget.getProgressBar().infinite().getContainer().show();
+					this.pickOpenWidget.getProgressBar().infinite().show();
 				}
 			});
 
@@ -557,7 +556,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		// Create upon first open
 		if (!this.quickOpenWidget) {
 			this.quickOpenWidget = new QuickOpenWidget(
-				withElementById(this.partService.getWorkbenchElementId()).getHTMLElement(),
+				document.getElementById(this.partService.getWorkbenchElementId()),
 				{
 					onOk: () => { /* ignore */ },
 					onCancel: () => { /* ignore */ },
@@ -574,7 +573,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			this.toUnbind.push(attachQuickOpenStyler(this.quickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
 
 			const quickOpenContainer = this.quickOpenWidget.create();
-			DOM.addClass(quickOpenContainer, 'show-file-icons');
+			addClass(quickOpenContainer, 'show-file-icons');
 			this.positionQuickOpenWidget();
 		}
 
@@ -623,11 +622,11 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		const titlebarOffset = this.partService.getTitleBarOffset();
 
 		if (this.quickOpenWidget) {
-			this.quickOpenWidget.getElement().style('top', `${titlebarOffset}px`);
+			this.quickOpenWidget.getElement().style.top = `${titlebarOffset}px`;
 		}
 
 		if (this.pickOpenWidget) {
-			this.pickOpenWidget.getElement().style('top', `${titlebarOffset}px`);
+			this.pickOpenWidget.getElement().style.top = `${titlebarOffset}px`;
 		}
 	}
 
@@ -742,7 +741,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 		// Reset Progress
 		if (!instantProgress) {
-			this.quickOpenWidget.getProgressBar().stop().getContainer().hide();
+			this.quickOpenWidget.getProgressBar().stop().hide();
 		}
 
 		// Reset Extra Class
@@ -784,7 +783,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		// Progress if task takes a long time
 		TPromise.timeout(instantProgress ? 0 : 800).then(() => {
 			if (!resultPromiseDone && currentResultToken === this.currentResultToken) {
-				this.quickOpenWidget.getProgressBar().infinite().getContainer().show();
+				this.quickOpenWidget.getProgressBar().infinite().show();
 			}
 		});
 
@@ -793,7 +792,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			resultPromiseDone = true;
 
 			if (currentResultToken === this.currentResultToken) {
-				this.quickOpenWidget.getProgressBar().getContainer().hide();
+				this.quickOpenWidget.getProgressBar().hide();
 			}
 		}, (error: any) => {
 			resultPromiseDone = true;
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index c944aae93aa..4ee3bbdd603 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -25,8 +25,8 @@ import { Event } from 'vs/base/common/event';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER } from 'vs/workbench/common/theme';
-import { Dimension } from 'vs/base/browser/builder';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension } from 'vs/base/browser/dom';
 
 export class SidebarPart extends CompositePart<Viewlet> {
 
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 49198a0da14..cef65a843f3 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -7,8 +7,7 @@
 
 import 'vs/css!./media/titlebarpart';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
-import * as DOM from 'vs/base/browser/dom';
+import { Builder, $ } from 'vs/base/browser/builder';
 import * as paths from 'vs/base/common/paths';
 import { Part } from 'vs/workbench/browser/part';
 import { ITitleService, ITitleProperties } from 'vs/workbench/services/title/common/titleService';
@@ -34,6 +33,7 @@ import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import URI from 'vs/base/common/uri';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { trim } from 'vs/base/common/strings';
+import { addDisposableListener, EventType, EventHelper, Dimension } from 'vs/base/browser/dom';
 
 export class TitlebarPart extends Part implements ITitleService {
 
@@ -86,8 +86,8 @@ export class TitlebarPart extends Part implements ITitleService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(DOM.addDisposableListener(window, DOM.EventType.BLUR, () => this.onBlur()));
-		this.toUnbind.push(DOM.addDisposableListener(window, DOM.EventType.FOCUS, () => this.onFocus()));
+		this.toUnbind.push(addDisposableListener(window, EventType.BLUR, () => this.onBlur()));
+		this.toUnbind.push(addDisposableListener(window, EventType.FOCUS, () => this.onFocus()));
 		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChanged(e)));
 		this.toUnbind.push(this.editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
 		this.toUnbind.push(this.contextService.onDidChangeWorkspaceFolders(() => this.setTitle(this.getWindowTitle())));
@@ -236,16 +236,16 @@ export class TitlebarPart extends Part implements ITitleService {
 		}
 
 		// Maximize/Restore on doubleclick
-		this.titleContainer.on(DOM.EventType.DBLCLICK, (e) => {
-			DOM.EventHelper.stop(e);
+		this.titleContainer.on(EventType.DBLCLICK, (e) => {
+			EventHelper.stop(e);
 
 			this.onTitleDoubleclick();
 		});
 
 		// Context menu on title
-		this.title.on([DOM.EventType.CONTEXT_MENU, DOM.EventType.MOUSE_DOWN], (e: MouseEvent) => {
-			if (e.type === DOM.EventType.CONTEXT_MENU || e.metaKey) {
-				DOM.EventHelper.stop(e);
+		this.title.on([EventType.CONTEXT_MENU, EventType.MOUSE_DOWN], (e: MouseEvent) => {
+			if (e.type === EventType.CONTEXT_MENU || e.metaKey) {
+				EventHelper.stop(e);
 
 				this.onContextMenu(e);
 			}
@@ -253,7 +253,7 @@ export class TitlebarPart extends Part implements ITitleService {
 
 		// Since the title area is used to drag the window, we do not want to steal focus from the
 		// currently active element. So we restore focus after a timeout back to where it was.
-		this.titleContainer.on([DOM.EventType.MOUSE_DOWN], () => {
+		this.titleContainer.on([EventType.MOUSE_DOWN], () => {
 			const active = document.activeElement;
 			setTimeout(() => {
 				if (active instanceof HTMLElement) {
diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts
index 97f55d94df5..28f0881979c 100644
--- a/src/vs/workbench/browser/parts/views/panelViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts
@@ -10,8 +10,8 @@ import { Event, Emitter, filterEvent } from 'vs/base/common/event';
 import { ColorIdentifier, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { attachStyler, IColorMapping } from 'vs/platform/theme/common/styler';
 import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND } from 'vs/workbench/common/theme';
-import { Dimension, Builder } from 'vs/base/browser/builder';
-import { append, $, trackFocus, toggleClass, EventType, isAncestor } from 'vs/base/browser/dom';
+import { Builder } from 'vs/base/browser/builder';
+import { append, $, trackFocus, toggleClass, EventType, isAncestor, Dimension } from 'vs/base/browser/dom';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { firstIndex } from 'vs/base/common/arrays';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index cadcc3059eb..a9790f253c6 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -6,7 +6,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import * as DOM from 'vs/base/browser/dom';
-import { $, Dimension, Builder } from 'vs/base/browser/builder';
+import { $, Builder } from 'vs/base/browser/builder';
 import { Scope } from 'vs/workbench/common/memento';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
@@ -190,7 +190,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 	private readonly viewsContextKeys: Set<string> = new Set<string>();
 	private viewsViewletPanels: ViewsViewletPanel[] = [];
 	private didLayout = false;
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 	protected viewsStates: Map<string, IViewState> = new Map<string, IViewState>();
 	private areExtensionsReady: boolean = false;
 
@@ -276,7 +276,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 		}
 	}
 
-	layout(dimension: Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		super.layout(dimension);
 		this.dimension = dimension;
 		if (this.didLayout) {
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 1995123083a..93112309b92 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -9,8 +9,6 @@ import 'vs/css!./media/shell';
 
 import * as platform from 'vs/base/common/platform';
 import * as perf from 'vs/base/common/performance';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
-import * as dom from 'vs/base/browser/dom';
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import * as errors from 'vs/base/common/errors';
@@ -96,6 +94,7 @@ import { NotificationService } from 'vs/workbench/services/notification/common/n
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { DialogService } from 'vs/workbench/services/dialogs/electron-browser/dialogService';
 import { DialogChannel } from 'vs/platform/dialogs/common/dialogIpc';
+import { EventType, addDisposableListener, addClass, getClientArea } from 'vs/base/browser/dom';
 
 /**
  * Services that we require for the Shell
@@ -135,7 +134,7 @@ export class WorkbenchShell {
 	private previousErrorValue: string;
 	private previousErrorTime: number;
 	private content: HTMLElement;
-	private contentsContainer: Builder;
+	private contentsContainer: HTMLElement;
 
 	private configuration: IWindowConfiguration;
 	private workbench: Workbench;
@@ -158,19 +157,20 @@ export class WorkbenchShell {
 		this.previousErrorTime = 0;
 	}
 
-	private createContents(parent: Builder): Builder {
+	private createContents(parent: HTMLElement): HTMLElement {
 
 		// ARIA
 		aria.setARIAContainer(document.body);
 
 		// Workbench Container
-		const workbenchContainer = $(parent).div();
+		const workbenchContainer = document.createElement('div');
+		parent.appendChild(workbenchContainer);
 
 		// Instantiation service with services
-		const [instantiationService, serviceCollection] = this.initServiceCollection(parent.getHTMLElement());
+		const [instantiationService, serviceCollection] = this.initServiceCollection(parent);
 
 		// Workbench
-		this.workbench = this.createWorkbench(instantiationService, serviceCollection, parent.getHTMLElement(), workbenchContainer.getHTMLElement());
+		this.workbench = this.createWorkbench(instantiationService, serviceCollection, parent, workbenchContainer);
 
 		// Window
 		this.workbench.getInstantiationService().createInstance(ElectronWindow, this.container);
@@ -475,13 +475,15 @@ export class WorkbenchShell {
 		});
 
 		// Shell Class for CSS Scoping
-		$(this.container).addClass('monaco-shell');
+		addClass(this.container, 'monaco-shell');
 
 		// Controls
-		this.content = $('.monaco-shell-content').appendTo(this.container).getHTMLElement();
+		this.content = document.createElement('div');
+		addClass(this.content, 'monaco-shell-content');
+		this.container.appendChild(this.content);
 
 		// Create Contents
-		this.contentsContainer = this.createContents($(this.content));
+		this.contentsContainer = this.createContents(this.content);
 
 		// Layout
 		this.layout();
@@ -493,7 +495,7 @@ export class WorkbenchShell {
 	private registerListeners(): void {
 
 		// Resize
-		$(window).on(dom.EventType.RESIZE, () => this.layout(), this.toUnbind);
+		this.toUnbind.push(addDisposableListener(window, EventType.RESIZE, () => this.layout()));
 	}
 
 	public onUnexpectedError(error: any): void {
@@ -520,10 +522,10 @@ export class WorkbenchShell {
 	}
 
 	private layout(): void {
-		const clArea = $(this.container).getClientArea();
+		const clientArea = getClientArea(this.container);
 
-		const contentsSize = new Dimension(clArea.width, clArea.height);
-		this.contentsContainer.size(contentsSize.width, contentsSize.height);
+		this.contentsContainer.style.width = `${clientArea.width}px`;
+		this.contentsContainer.style.height = `${clientArea.height}px`;
 
 		this.contextViewService.layout();
 		this.workbench.layout();
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 565f19c583d..e2a5c184d8d 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -38,7 +38,7 @@ import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickO
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
 import { getServices } from 'vs/platform/instantiation/common/extensions';
-import { Position, Parts, IPartService, ILayoutOptions, Dimension } from 'vs/workbench/services/part/common/partService';
+import { Position, Parts, IPartService, ILayoutOptions, IDimension } from 'vs/workbench/services/part/common/partService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ContextMenuService } from 'vs/workbench/services/contextview/electron-browser/contextmenuService';
@@ -267,7 +267,7 @@ export class Workbench implements IPartService {
 		return this._onTitleBarVisibilityChange.event;
 	}
 
-	public get onEditorLayout(): Event<Dimension> {
+	public get onEditorLayout(): Event<IDimension> {
 		return this.editorPart.onLayout;
 	}
 
@@ -1152,8 +1152,8 @@ export class Workbench implements IPartService {
 	private createWorkbenchLayout(): void {
 		this.workbenchLayout = this.instantiationService.createInstance(
 			WorkbenchLayout,
-			$(this.container),							// Parent
-			this.workbench,								// Workbench Container
+			this.container,								// Parent
+			this.workbench.getHTMLElement(),			// Workbench Container
 			{
 				titlebar: this.titlebarPart,			// Title Bar
 				activitybar: this.activitybarPart,		// Activity Bar
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index 8eb08ca23f2..bbf67306fc4 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -79,7 +79,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		this.$el.append(actionBarContainter);
 
 		this.activeActions = [];
-		this.actionBar = new ActionBar(actionBarContainter, {
+		this.actionBar = new ActionBar(actionBarContainter.getHTMLElement(), {
 			orientation: ActionsOrientation.HORIZONTAL,
 			actionItemProvider: (action: IAction) => {
 				if (action.id === FocusProcessAction.ID) {
@@ -228,7 +228,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		}
 		if (!this.isBuilt) {
 			this.isBuilt = true;
-			this.$el.build(builder.withElementById(this.partService.getWorkbenchElementId()).getHTMLElement());
+			this.$el.build(document.getElementById(this.partService.getWorkbenchElementId()));
 		}
 
 		this.isVisible = true;
diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts
index da481600c74..a3551f72a7a 100644
--- a/src/vs/workbench/parts/debug/electron-browser/repl.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts
@@ -10,7 +10,7 @@ import { wireCancellationToken } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import { IAction } from 'vs/base/common/actions';
-import { Dimension, Builder } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { isMacintosh } from 'vs/base/common/platform';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -80,7 +80,7 @@ export class Repl extends Panel implements IPrivateReplService {
 	private replInputContainer: HTMLElement;
 	private refreshTimeoutHandle: number;
 	private actions: IAction[];
-	private dimension: Dimension;
+	private dimension: dom.Dimension;
 	private replInputHeight: number;
 	private model: ITextModel;
 
@@ -242,7 +242,7 @@ export class Repl extends Panel implements IPrivateReplService {
 		return text;
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		this.dimension = dimension;
 		if (this.tree) {
 			this.renderer.setWidth(dimension.width - 25, this.characterWidth);
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 47e91ea3a1e..516a1d76d6c 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -12,7 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { isPromiseCanceledError, onUnexpectedError, create as createError } from 'vs/base/common/errors';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { Event as EventOf, mapEvent, chain } from 'vs/base/common/event';
 import { IAction } from 'vs/base/common/actions';
 import { domEvent } from 'vs/base/browser/event';
@@ -21,7 +21,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { append, $, addStandardDisposableListener, EventType, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
+import { append, $, addStandardDisposableListener, EventType, addClass, removeClass, toggleClass, Dimension } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index 331d6a62735..76dae04de2d 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -14,7 +14,7 @@ import { EditorInput } from 'vs/workbench/common/editor';
 import pkg from 'vs/platform/node/package';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -24,7 +24,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { IExtensionService, IExtensionDescription, IExtensionsStatus, IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions';
 import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { append, $, addClass, toggleClass } from 'vs/base/browser/dom';
+import { append, $, addClass, toggleClass, Dimension } from 'vs/base/browser/dom';
 import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vs/base/common/async';
@@ -299,7 +299,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 				let syncTime = activationTimes.codeLoadingTime + activationTimes.activateCallTime;
 				data.activationTime.textContent = activationTimes.startup ? `Startup Activation: ${syncTime}ms` : `Activation: ${syncTime}ms`;
 				data.actionbar.context = element;
-				toggleClass(data.actionbar.getContainer().getHTMLElement(), 'hidden', element.marketplaceInfo && element.marketplaceInfo.type === LocalExtensionType.User && (!element.description.repository || !element.description.repository.url));
+				toggleClass(data.actionbar.getContainer(), 'hidden', element.marketplaceInfo && element.marketplaceInfo.type === LocalExtensionType.User && (!element.description.repository || !element.description.repository.url));
 
 				let title: string;
 				if (activationTimes.activationEvent === '*') {
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
index 4ab3841d55e..eb1e969e4a8 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
@@ -96,8 +96,8 @@ export class FeedbackDropdown extends Dropdown {
 			}
 		});
 
-		this.element.addClass('send-feedback');
-		this.element.title(nls.localize('sendFeedback', "Tweet Feedback"));
+		dom.addClass(this.element, 'send-feedback');
+		this.element.title = nls.localize('sendFeedback', "Tweet Feedback");
 
 		this.feedbackService = options.feedbackService;
 
@@ -118,7 +118,7 @@ export class FeedbackDropdown extends Dropdown {
 	}
 
 	protected getAnchor(): HTMLElement | IAnchor {
-		const res = dom.getDomNodePagePosition(this.element.getHTMLElement());
+		const res = dom.getDomNodePagePosition(this.element);
 
 		return {
 			x: res.left,
@@ -249,7 +249,7 @@ export class FeedbackDropdown extends Dropdown {
 
 		$('label').attr('for', 'hide-button').text(nls.localize('showFeedback', "Show Feedback Smiley in Status Bar")).appendTo($hideButtonContainer);
 
-		this.sendButton = new Button($buttons);
+		this.sendButton = new Button($buttons.getHTMLElement());
 		this.sendButton.enabled = false;
 		this.sendButton.label = nls.localize('tweet', "Tweet");
 		this.$sendButton = new Builder(this.sendButton.element);
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
index 9a233504390..1a659b36d9a 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
@@ -95,7 +95,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 		super.updateStyles();
 
 		if (this.dropdown) {
-			this.dropdown.label.style('background-color', this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
+			$(this.dropdown.label).style('background-color', this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
 		}
 	}
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
index e2253c98749..f0430ac6ed2 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
@@ -56,7 +56,7 @@ export class EmptyView extends ViewsViewletPanel {
 
 		let section = $('div.section').appendTo(container);
 
-		this.button = new Button(section);
+		this.button = new Button(section.getHTMLElement());
 		attachButtonStyler(this.button, this.themeService);
 
 		this.disposables.push(this.button.onDidClick(() => {
diff --git a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts b/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
index c208bfaf888..d32bae9298d 100644
--- a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
+++ b/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
@@ -9,8 +9,8 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 import { Webview } from './webview';
-import { Dimension } from 'vs/workbench/services/part/common/partService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
+import { Dimension } from 'vs/base/browser/dom';
 
 /**  A context key that is set when a webview editor has focus. */
 export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS = new RawContextKey<boolean>('webviewEditorFocus', false);
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index 7829900176f..4a9472862ee 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -8,7 +8,7 @@
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
-import { Dimension, Builder } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { empty as EmptyDisposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
 import { EditorOptions, EditorInput } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
@@ -21,13 +21,13 @@ import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/r
 import { Parts, IPartService } from 'vs/workbench/services/part/common/partService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-
 import { Webview, WebviewOptions } from './webview';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { BaseWebviewEditor } from './baseWebviewEditor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import URI from 'vs/base/common/uri';
 import { Scope } from 'vs/workbench/common/memento';
+import { Dimension } from 'vs/base/browser/dom';
 
 export interface HtmlPreviewEditorViewState {
 	scrollYPercentage: number;
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index 96a071219be..31136c190fc 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -90,7 +90,7 @@ export class MarkersPanel extends Panel {
 		return Messages.MARKERS_PANEL_TITLE_PROBLEMS;
 	}
 
-	public layout(dimension: builder.Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		this.tree.layout(dimension.height, dimension.width);
 	}
 
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts b/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
index 788fd9dbc1d..237f4d4efa9 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
@@ -17,7 +17,6 @@ import { InputBox, IInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Dimension } from 'vs/base/browser/builder';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
@@ -189,7 +188,7 @@ export class DefineKeybindingWidget extends Widget {
 		});
 	}
 
-	layout(layout: Dimension): void {
+	layout(layout: dom.Dimension): void {
 		let top = Math.round((layout.height - DefineKeybindingWidget.HEIGHT) / 2);
 		this._domNode.setTop(top);
 
@@ -290,7 +289,7 @@ export class DefineKeybindingOverlayWidget extends Disposable implements IOverla
 	public start(): TPromise<string> {
 		this._editor.revealPositionInCenterIfOutsideViewport(this._editor.getPosition(), ScrollType.Smooth);
 		const layoutInfo = this._editor.getLayoutInfo();
-		this._widget.layout(new Dimension(layoutInfo.width, layoutInfo.height));
+		this._widget.layout(new dom.Dimension(layoutInfo.width, layoutInfo.height));
 		return this._widget.define();
 	}
 }
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index a19ef06edf6..ec96d8d0f85 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -11,7 +11,7 @@ import * as DOM from 'vs/base/browser/dom';
 import { OS } from 'vs/base/common/platform';
 import { dispose } from 'vs/base/common/lifecycle';
 import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { IAction } from 'vs/base/common/actions';
@@ -90,7 +90,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	private listEntries: IListEntry[];
 	private keybindingsList: List<IListEntry>;
 
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 	private delayedFiltering: Delayer<void>;
 	private latestEmptyFilters: string[] = [];
 	private delayedFilterLogging: Delayer<void>;
@@ -152,7 +152,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		this.keybindingFocusContextKey.reset();
 	}
 
-	layout(dimension: Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		this.dimension = dimension;
 		this.searchWidget.layout(dimension);
 
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 266ea2a1400..fad5c212b78 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -11,7 +11,7 @@ import { onUnexpectedError, isPromiseCanceledError, getErrorMessage } from 'vs/b
 import * as DOM from 'vs/base/browser/dom';
 import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
 import * as arrays from 'vs/base/common/arrays';
-import { Dimension, Builder } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { ArrayNavigator } from 'vs/base/common/iterator';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
@@ -192,11 +192,11 @@ export class PreferencesEditor extends BaseEditor {
 		return super.setInput(newInput, options).then(() => this.updateInput(oldInput, newInput, options));
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		DOM.toggleClass(this.headerContainer, 'vertical-layout', dimension.width < 700);
 		this.searchWidget.layout(dimension);
 		const headerHeight = DOM.getTotalHeight(this.headerContainer);
-		this.sideBySidePreferencesWidget.layout(new Dimension(dimension.width, dimension.height - headerHeight));
+		this.sideBySidePreferencesWidget.layout(new DOM.Dimension(dimension.width, dimension.height - headerHeight));
 	}
 
 	public getControl(): IEditorControl {
@@ -772,7 +772,7 @@ class PreferencesRenderersController extends Disposable {
 
 class SideBySidePreferencesWidget extends Widget {
 
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 
 	private defaultPreferencesHeader: HTMLElement;
 	private defaultPreferencesEditor: DefaultPreferencesEditor;
@@ -859,7 +859,7 @@ class SideBySidePreferencesWidget extends Widget {
 		this.settingsTargetsWidget.setResultCount(settingsTarget, count);
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		this.dimension = dimension;
 		this.sash.setDimenesion(this.dimension);
 	}
@@ -935,8 +935,8 @@ class SideBySidePreferencesWidget extends Widget {
 		this.editablePreferencesEditorContainer.style.height = `${this.dimension.height}px`;
 		this.editablePreferencesEditorContainer.style.left = `${splitPoint}px`;
 
-		this.defaultPreferencesEditor.layout(new Dimension(detailsEditorWidth, this.dimension.height - 34 /* height of header container */));
-		this.editablePreferencesEditor.layout(new Dimension(masterEditorWidth, this.dimension.height - 34 /* height of header container */));
+		this.defaultPreferencesEditor.layout(new DOM.Dimension(detailsEditorWidth, this.dimension.height - 34 /* height of header container */));
+		this.editablePreferencesEditor.layout(new DOM.Dimension(masterEditorWidth, this.dimension.height - 34 /* height of header container */));
 	}
 
 	private getSettingsTarget(resource: URI): SettingsTarget {
@@ -1042,7 +1042,7 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		super.clearInput();
 	}
 
-	public layout(dimension: Dimension) {
+	public layout(dimension: DOM.Dimension) {
 		this.getControl().layout(dimension);
 	}
 
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
index eb553335292..a33dee8823a 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
@@ -5,7 +5,7 @@
 
 import { localize } from 'vs/nls';
 import URI from 'vs/base/common/uri';
-import { Dimension, $ } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -649,7 +649,7 @@ export class SearchWidget extends Widget {
 		this.countElement.style.color = color ? color.toString() : null;
 	}
 
-	public layout(dimension: Dimension) {
+	public layout(dimension: DOM.Dimension) {
 		if (dimension.width < 400) {
 			if (this.countElement) {
 				DOM.addClass(this.countElement, 'hide');
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index b320d1e7db5..3a7e31b081d 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -13,9 +13,9 @@ import { domEvent, stop } from 'vs/base/browser/event';
 import { basename } from 'vs/base/common/paths';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose, combinedDisposable, empty as EmptyDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { PanelViewlet, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
-import { append, $, addClass, toggleClass, trackFocus } from 'vs/base/browser/dom';
+import { append, $, addClass, toggleClass, trackFocus, Dimension } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { List } from 'vs/base/browser/ui/list/listWidget';
 import { IDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
diff --git a/src/vs/workbench/parts/search/browser/patternInputWidget.ts b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
index c83d533c470..2b900f9f3c9 100644
--- a/src/vs/workbench/parts/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
@@ -5,7 +5,6 @@
 
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
 import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
@@ -73,7 +72,7 @@ export class PatternInputWidget extends Widget {
 		switch (eventType) {
 			case 'keydown':
 			case 'keyup':
-				$(this.inputBox.inputElement).on(eventType, handler);
+				this._register(dom.addDisposableListener(this.inputBox.inputElement, eventType, handler));
 				break;
 			case PatternInputWidget.OPTION_CHANGE:
 				this.onOptionChange = handler;
@@ -158,7 +157,7 @@ export class PatternInputWidget extends Widget {
 	private render(): void {
 		this.domNode = document.createElement('div');
 		this.domNode.style.width = this.width + 'px';
-		$(this.domNode).addClass('monaco-findInput');
+		dom.addClass(this.domNode, 'monaco-findInput');
 
 		this.inputBox = new InputBox(this.domNode, this.contextViewProvider, {
 			placeholder: this.placeholder || '',
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index d40610f8601..1626a1441f3 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -19,7 +19,7 @@ import * as paths from 'vs/base/common/paths';
 import * as dom from 'vs/base/browser/dom';
 import { IAction } from 'vs/base/common/actions';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
 import { ITree, IFocusEvent } from 'vs/base/parts/tree/browser/tree';
 import { Scope } from 'vs/workbench/common/memento';
@@ -96,7 +96,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	private messages: Builder;
 	private searchWidgetsContainer: Builder;
 	private searchWidget: SearchWidget;
-	private size: Dimension;
+	private size: dom.Dimension;
 	private queryDetails: HTMLElement;
 	private inputPatternIncludes: ExcludePatternInputWidget;
 	private results: Builder;
@@ -771,7 +771,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.tree.layout(searchResultContainerSize);
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		this.size = dimension;
 		this.reLayout();
 	}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 91ec22cb780..a7f25db2960 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -14,7 +14,6 @@ import { Event, Emitter } from 'vs/base/common/event';
 import Uri from 'vs/base/common/uri';
 import { WindowsShellHelper } from 'vs/workbench/parts/terminal/electron-browser/windowsShellHelper';
 import { Terminal as XTermTerminal } from 'vscode-xterm';
-import { Dimension } from 'vs/base/browser/builder';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
@@ -69,7 +68,7 @@ enum ProcessState {
 export class TerminalInstance implements ITerminalInstance {
 	private static readonly EOL_REGEX = /\r?\n/g;
 
-	private static _lastKnownDimensions: Dimension = null;
+	private static _lastKnownDimensions: dom.Dimension = null;
 	private static _idCounter = 1;
 
 	private _id: number;
@@ -246,7 +245,7 @@ export class TerminalInstance implements ITerminalInstance {
 		return dimension.width;
 	}
 
-	private _getDimension(width: number, height: number): Dimension {
+	private _getDimension(width: number, height: number): dom.Dimension {
 		// The font needs to have been initialized
 		const font = this._configHelper.getFont(this._xterm);
 		if (!font || !font.charWidth || !font.charHeight) {
@@ -278,7 +277,7 @@ export class TerminalInstance implements ITerminalInstance {
 		const innerWidth = width - marginLeft - marginRight;
 		const innerHeight = height - bottom;
 
-		TerminalInstance._lastKnownDimensions = new Dimension(innerWidth, innerHeight);
+		TerminalInstance._lastKnownDimensions = new dom.Dimension(innerWidth, innerHeight);
 		return TerminalInstance._lastKnownDimensions;
 	}
 
@@ -466,7 +465,7 @@ export class TerminalInstance implements ITerminalInstance {
 			const computedStyle = window.getComputedStyle(this._container);
 			const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
 			const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
-			this.layout(new Dimension(width, height));
+			this.layout(new dom.Dimension(width, height));
 			this.setVisible(this._isVisible);
 			this.updateConfig();
 
@@ -613,7 +612,7 @@ export class TerminalInstance implements ITerminalInstance {
 				const computedStyle = window.getComputedStyle(this._container);
 				const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
 				const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
-				this.layout(new Dimension(width, height));
+				this.layout(new dom.Dimension(width, height));
 			}
 		}
 	}
@@ -1109,7 +1108,7 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		if (this.disableLayout) {
 			return;
 		}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index 5667a99df12..c41c318e81b 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -9,7 +9,7 @@ import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
 import * as platform from 'vs/base/common/platform';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -84,11 +84,11 @@ export class TerminalPanel extends Panel {
 		this._updateTheme();
 
 		// Force another layout (first is setContainers) since config has changed
-		this.layout(new Dimension(this._terminalContainer.offsetWidth, this._terminalContainer.offsetHeight));
+		this.layout(new dom.Dimension(this._terminalContainer.offsetWidth, this._terminalContainer.offsetHeight));
 		return TPromise.as(void 0);
 	}
 
-	public layout(dimension?: Dimension): void {
+	public layout(dimension?: dom.Dimension): void {
 		if (!dimension) {
 			return;
 		}
@@ -338,7 +338,7 @@ export class TerminalPanel extends Panel {
 		}
 		// TODO: Can we support ligatures?
 		// dom.toggleClass(this._parentDomElement, 'enable-ligatures', this._terminalService.configHelper.config.fontLigatures);
-		this.layout(new Dimension(this._parentDomElement.offsetWidth, this._parentDomElement.offsetHeight));
+		this.layout(new dom.Dimension(this._parentDomElement.offsetWidth, this._parentDomElement.offsetHeight));
 	}
 
 	/**
diff --git a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
index e750345e23c..44449b32df2 100644
--- a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
+++ b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
@@ -21,7 +21,7 @@ import { OpenRecentAction } from 'vs/workbench/electron-browser/actions';
 import { GlobalNewUntitledFileAction } from 'vs/workbench/parts/files/electron-browser/fileActions';
 import { OpenFolderAction, OpenFileFolderAction, OpenFileAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
-import { Parts, IPartService, Dimension } from 'vs/workbench/services/part/common/partService';
+import { Parts, IPartService, IDimension } from 'vs/workbench/services/part/common/partService';
 import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { FindInFilesActionId } from 'vs/workbench/parts/search/common/constants';
 import { ToggleTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
@@ -179,7 +179,7 @@ export class WatermarkContribution implements IWorkbenchContribution {
 		update();
 		this.watermark.build(container.firstElementChild as HTMLElement, 0);
 		this.toDispose.push(this.keybindingService.onDidUpdateKeybindings(update));
-		this.toDispose.push(this.partService.onEditorLayout(({ height }: Dimension) => {
+		this.toDispose.push(this.partService.onEditorLayout(({ height }: IDimension) => {
 			container.classList[height <= 478 ? 'add' : 'remove']('max-height-478px');
 		}));
 	}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index ddbd2bc080d..b3d963f146b 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -8,7 +8,7 @@ import { IDisposable, } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
 import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from 'vs/workbench/parts/html/electron-browser/baseWebviewEditor';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -67,7 +67,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		if (this._webview) {
 			this.doUpdateContainer();
 		}
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index cf45387bede..1d32c0c1670 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -11,7 +11,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import * as strings from 'vs/base/common/strings';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { $, Dimension, Builder } from 'vs/base/browser/builder';
+import { $, Builder } from 'vs/base/browser/builder';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -40,6 +40,7 @@ import { UILabelProvider } from 'vs/base/common/keybindingLabels';
 import { OS, OperatingSystem } from 'vs/base/common/platform';
 import { deepClone } from 'vs/base/common/objects';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension } from 'vs/base/browser/dom';
 
 export const WALK_THROUGH_FOCUS = new RawContextKey<boolean>('interactivePlaygroundFocus', false);
 
diff --git a/src/vs/workbench/services/part/common/partService.ts b/src/vs/workbench/services/part/common/partService.ts
index c9a780fb3b4..c96d2e0ed70 100644
--- a/src/vs/workbench/services/part/common/partService.ts
+++ b/src/vs/workbench/services/part/common/partService.ts
@@ -28,7 +28,7 @@ export interface ILayoutOptions {
 	source?: Parts;
 }
 
-export interface Dimension {
+export interface IDimension {
 	readonly width: number;
 	readonly height: number;
 }
@@ -46,7 +46,7 @@ export interface IPartService {
 	/**
 	 * Emits when the editor part's layout changes.
 	 */
-	onEditorLayout: Event<Dimension>;
+	onEditorLayout: Event<IDimension>;
 
 	/**
 	 * Asks the part service to layout all parts.
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index f34a176cfe3..dac37102f25 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -102,17 +102,17 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 
 		// Replay Infinite Progress
 		else if (this.progressState.infinite) {
-			this.progressbar.infinite().getContainer().show();
+			this.progressbar.infinite().show();
 		}
 
 		// Replay Finite Progress (Total & Worked)
 		else {
 			if (this.progressState.total) {
-				this.progressbar.total(this.progressState.total).getContainer().show();
+				this.progressbar.total(this.progressState.total).show();
 			}
 
 			if (this.progressState.worked) {
-				this.progressbar.worked(this.progressState.worked).getContainer().show();
+				this.progressbar.worked(this.progressState.worked).show();
 			}
 		}
 	}
@@ -152,20 +152,12 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 
 			// Infinite: Start Progressbar and Show after Delay
 			if (!types.isUndefinedOrNull(infinite)) {
-				if (types.isUndefinedOrNull(delay)) {
-					this.progressbar.infinite().getContainer().show();
-				} else {
-					this.progressbar.infinite().getContainer().showDelayed(delay);
-				}
+				this.progressbar.infinite().show(delay);
 			}
 
 			// Finite: Start Progressbar and Show after Delay
 			else if (!types.isUndefinedOrNull(total)) {
-				if (types.isUndefinedOrNull(delay)) {
-					this.progressbar.total(total).getContainer().show();
-				} else {
-					this.progressbar.total(total).getContainer().showDelayed(delay);
-				}
+				this.progressbar.total(total).show(delay);
 			}
 		}
 
@@ -200,7 +192,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 					this.progressState.infinite = true;
 					this.progressState.worked = void 0;
 					this.progressState.total = void 0;
-					this.progressbar.infinite().getContainer().show();
+					this.progressbar.infinite().show();
 				}
 			},
 
@@ -209,7 +201,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 				this.progressState.done = true;
 
 				if (this.isActive) {
-					this.progressbar.stop().getContainer().hide();
+					this.progressbar.stop().hide();
 				}
 			}
 		};
@@ -244,7 +236,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 			this.clearProgressState();
 
 			if (this.isActive) {
-				this.progressbar.stop().getContainer().hide();
+				this.progressbar.stop().hide();
 			}
 		};
 
@@ -257,11 +249,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 
 		// Show Progress when active
 		if (this.isActive) {
-			if (types.isUndefinedOrNull(delay)) {
-				this.progressbar.infinite().getContainer().show();
-			} else {
-				this.progressbar.infinite().getContainer().showDelayed(delay);
-			}
+			this.progressbar.infinite().show(delay);
 		}
 	}
 
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 6e1bab75448..abe12f5b9e7 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -20,10 +20,7 @@ import { ColorThemeData } from './colorThemeData';
 import { ITheme, Extensions as ThemingExtensions, IThemingRegistry } from 'vs/platform/theme/common/themeService';
 import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { Color } from 'vs/base/common/color';
-
-import { $ } from 'vs/base/browser/builder';
 import { Event, Emitter } from 'vs/base/common/event';
-
 import * as colorThemeSchema from 'vs/workbench/services/themes/common/colorThemeSchema';
 import * as fileIconThemeSchema from 'vs/workbench/services/themes/common/fileIconThemeSchema';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -32,6 +29,7 @@ import { ColorThemeStore } from 'vs/workbench/services/themes/electron-browser/c
 import { FileIconThemeStore } from 'vs/workbench/services/themes/electron-browser/fileIconThemeStore';
 import { FileIconThemeData } from 'vs/workbench/services/themes/electron-browser/fileIconThemeData';
 import { IWindowService } from 'vs/platform/windows/common/windows';
+import { removeClasses, addClasses } from 'vs/base/browser/dom';
 
 // implementation
 
@@ -315,11 +313,11 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 	private applyTheme(newTheme: ColorThemeData, settingsTarget: ConfigurationTarget, silent = false): TPromise<IColorTheme> {
 		if (this.container) {
 			if (this.currentColorTheme) {
-				$(this.container).removeClass(this.currentColorTheme.id);
+				removeClasses(this.container, this.currentColorTheme.id);
 			} else {
-				$(this.container).removeClass(VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME);
+				removeClasses(this.container, VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME);
 			}
-			$(this.container).addClass(newTheme.id);
+			addClasses(this.container, newTheme.id);
 		}
 		this.currentColorTheme = newTheme;
 		if (!this.themingParticipantChangeListener) {
@@ -415,9 +413,9 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 
 		if (this.container) {
 			if (iconThemeData.id) {
-				$(this.container).addClass(fileIconsEnabledClass);
+				addClasses(this.container, fileIconsEnabledClass);
 			} else {
-				$(this.container).removeClass(fileIconsEnabledClass);
+				removeClasses(this.container, fileIconsEnabledClass);
 			}
 		}
 		if (iconThemeData.id) {
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
index 6eaae451336..27dea733652 100644
--- a/src/vs/workbench/test/browser/part.test.ts
+++ b/src/vs/workbench/test/browser/part.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Build, Builder } from 'vs/base/browser/builder';
+import { Builder } from 'vs/base/browser/builder';
 import { Part } from 'vs/workbench/browser/part';
 import * as Types from 'vs/base/common/types';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -97,7 +97,7 @@ suite('Workbench Part', () => {
 	});
 
 	test('Creation', function () {
-		let b = Build.withElementById(fixtureId);
+		let b = new Builder(document.getElementById(fixtureId));
 		b.div().hide();
 
 		let part = new MyPart(b);
@@ -134,24 +134,24 @@ suite('Workbench Part', () => {
 	});
 
 	test('Part Layout with Title and Content', function () {
-		let b = Build.withElementById(fixtureId);
+		let b = new Builder(document.getElementById(fixtureId));
 		b.div().hide();
 
 		let part = new MyPart2();
 		part.create(b);
 
-		assert(Build.withElementById('myPart.title'));
-		assert(Build.withElementById('myPart.content'));
+		assert(document.getElementById('myPart.title'));
+		assert(document.getElementById('myPart.content'));
 	});
 
 	test('Part Layout with Content only', function () {
-		let b = Build.withElementById(fixtureId);
+		let b = new Builder(document.getElementById(fixtureId));
 		b.div().hide();
 
 		let part = new MyPart3();
 		part.create(b);
 
-		assert(!Build.withElementById('myPart.title'));
-		assert(Build.withElementById('myPart.content'));
+		assert(!document.getElementById('myPart.title'));
+		assert(document.getElementById('myPart.content'));
 	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index af76f5abce9..220a4d8e75a 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -20,7 +20,7 @@ import Severity from 'vs/base/common/severity';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IPartService, Parts, Position as PartPosition, Dimension } from 'vs/workbench/services/part/common/partService';
+import { IPartService, Parts, Position as PartPosition, IDimension } from 'vs/workbench/services/part/common/partService';
 import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IEditorInput, IEditorOptions, Position, IEditor, IResourceInput } from 'vs/platform/editor/common/editor';
@@ -351,13 +351,13 @@ export class TestPartService implements IPartService {
 	public _serviceBrand: any;
 
 	private _onTitleBarVisibilityChange = new Emitter<void>();
-	private _onEditorLayout = new Emitter<Dimension>();
+	private _onEditorLayout = new Emitter<IDimension>();
 
 	public get onTitleBarVisibilityChange(): Event<void> {
 		return this._onTitleBarVisibilityChange.event;
 	}
 
-	public get onEditorLayout(): Event<Dimension> {
+	public get onEditorLayout(): Event<IDimension> {
 		return this._onEditorLayout.event;
 	}
 

From 02e6e1b9570bd76a5a0ef921dfcdc622b49071fd Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 15:06:06 +0200
Subject: [PATCH 289/383] fix tests

---
 .../services/progress/test/progressService.test.ts    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/services/progress/test/progressService.test.ts b/src/vs/workbench/services/progress/test/progressService.test.ts
index 0f8a924c3fd..83b2b91d522 100644
--- a/src/vs/workbench/services/progress/test/progressService.test.ts
+++ b/src/vs/workbench/services/progress/test/progressService.test.ts
@@ -212,11 +212,12 @@ class TestProgressBar {
 		return this.done();
 	}
 
-	public getContainer() {
-		return {
-			show: function () { },
-			hide: function () { }
-		};
+	public show(): void {
+
+	}
+
+	public hide(): void {
+
 	}
 }
 

From f081e9ae2a199c0fdbe7203e47e8ad48003b63b0 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 3 Apr 2018 15:32:02 +0200
Subject: [PATCH 290/383] Mark 'Languages' as deprecated (for #47103)

---
 .../services/extensions/common/extensionsRegistry.ts  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index 92ca673dc8b..7dc0e037da8 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -147,8 +147,15 @@ const schema: IJSONSchema = {
 			type: 'array',
 			uniqueItems: true,
 			items: {
-				type: 'string',
-				enum: ['Programming Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure', 'Language Packs']
+				oneOf: [{
+					type: 'string',
+					enum: ['Programming Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure', 'Language Packs'],
+				},
+				{
+					type: 'string',
+					const: 'Languages',
+					deprecationMessage: nls.localize('vscode.extension.category.languages.deprecated', 'Use \'Programming  Languages\' instead'),
+				}]
 			}
 		},
 		galleryBanner: {

From c72c3cf18dcf9e1d6db1a01a84005ca612fb6b70 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@gmail.com>
Date: Tue, 3 Apr 2018 16:57:39 +0200
Subject: [PATCH 291/383] Welcome: Overlay could mention new notifications
 location (fixes #45061) (#47134)

---
 .../parts/welcome/overlay/browser/welcomeOverlay.css   | 10 +++++++++-
 .../parts/welcome/overlay/browser/welcomeOverlay.ts    |  7 +++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
index 50cf77eafad..bc843e58ab3 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
@@ -97,8 +97,16 @@
 	left: 45px;
 }
 
+.monaco-workbench > .welcomeOverlay > .key.notifications {
+	position: absolute;
+	bottom: 25px;
+	right: 16px;
+}
+
 .monaco-workbench > .welcomeOverlay > .key.problems > .label,
-.monaco-workbench > .welcomeOverlay > .key.problems > .shortcut {
+.monaco-workbench > .welcomeOverlay > .key.problems > .shortcut,
+.monaco-workbench > .welcomeOverlay > .key.notifications > .label,
+.monaco-workbench > .welcomeOverlay > .key.notifications > .shortcut {
 	vertical-align: super;
 }
 
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
index 75313c3e266..9e0118794aa 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
@@ -91,6 +91,13 @@ const keys: Key[] = [
 		label: localize('welcomeOverlay.commandPalette', "Find and run all commands"),
 		command: ShowAllCommandsAction.ID
 	},
+	{
+		id: 'notifications',
+		arrow: '&cudarrr;',
+		arrowLast: true,
+		label: localize('welcomeOverlay.notifications', "Show notifications"),
+		command: 'notifications.showList'
+	}
 ];
 
 const OVERLAY_VISIBLE = new RawContextKey<boolean>('interfaceOverviewVisible', false);

From 21ab3fb4d3008fc347b64e1dbece9bb1387a542b Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 3 Apr 2018 16:57:46 +0200
Subject: [PATCH 292/383] fix linux continuous build

---
 build/tfs/continuous-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tfs/continuous-build.yml b/build/tfs/continuous-build.yml
index b5333d7de8d..62df6a00c4d 100644
--- a/build/tfs/continuous-build.yml
+++ b/build/tfs/continuous-build.yml
@@ -28,7 +28,7 @@ phases:
   steps:
   - script: |
       apt-get update
-      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb
+      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-dev
       cp build/tfs/linux/x64/xvfb.init /etc/init.d/xvfb
       chmod +x /etc/init.d/xvfb
       update-rc.d xvfb defaults

From 55ba13ec8cd9801ebb362b616493920393bece00 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 3 Apr 2018 17:06:59 +0200
Subject: [PATCH 293/383] continuous build

---
 build/tfs/continuous-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tfs/continuous-build.yml b/build/tfs/continuous-build.yml
index 62df6a00c4d..72d1e573fc2 100644
--- a/build/tfs/continuous-build.yml
+++ b/build/tfs/continuous-build.yml
@@ -28,7 +28,7 @@ phases:
   steps:
   - script: |
       apt-get update
-      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-dev
+      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
       cp build/tfs/linux/x64/xvfb.init /etc/init.d/xvfb
       chmod +x /etc/init.d/xvfb
       update-rc.d xvfb defaults

From 1f9184254c5c6f53d68f5840b5a6b61bee8264d1 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 3 Apr 2018 17:21:24 +0200
Subject: [PATCH 294/383] Fix #47147

---
 src/vs/workbench/api/node/extHostTreeViews.ts   |  6 +++---
 .../api/extHostTreeViews.test.ts                | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index b6ddcfa97a0..9cadef91101 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -152,7 +152,7 @@ class ExtHostTreeView<T> extends Disposable {
 
 	private resolveTreeNode(element: T, parent?: TreeNode): TPromise<TreeNode> {
 		return asWinJsPromise(() => this.dataProvider.getTreeItem(element))
-			.then(extTreeItem => this.createHandle(element, extTreeItem, parent))
+			.then(extTreeItem => this.createHandle(element, extTreeItem, parent, true))
 			.then(handle => this.getChildren(parent ? parent.item.handle : null)
 				.then(() => {
 					const cachedElement = this.getExtensionElement(handle);
@@ -303,7 +303,7 @@ class ExtHostTreeView<T> extends Disposable {
 		return item;
 	}
 
-	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent?: TreeNode): TreeItemHandle {
+	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode, first?: boolean): TreeItemHandle {
 		if (id) {
 			return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`;
 		}
@@ -316,7 +316,7 @@ class ExtHostTreeView<T> extends Disposable {
 
 		for (let counter = 0; counter <= childrenNodes.length; counter++) {
 			const handle = `${prefix}/${counter}:${elementId}`;
-			if (!this.elements.has(handle) || existingHandle === handle) {
+			if (first || !this.elements.has(handle) || existingHandle === handle) {
 				return handle;
 			}
 		}
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
index 9b95fc29698..969cac30359 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
@@ -423,7 +423,7 @@ suite('ExtHostTreeView', function () {
 			});
 	});
 
-	test('reveal will return parents array for an element', () => {
+	test('reveal will return parents array for an element when hierarchy is not loaded', () => {
 		const revealTarget = sinon.spy(target, '$reveal');
 		const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() });
 		return treeView.reveal({ key: 'aa' })
@@ -436,6 +436,21 @@ suite('ExtHostTreeView', function () {
 			});
 	});
 
+	test('reveal will return parents array for an element when hierarchy is loaded', () => {
+		const revealTarget = sinon.spy(target, '$reveal');
+		const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() });
+		return testObject.$getChildren('treeDataProvider')
+			.then(() => testObject.$getChildren('treeDataProvider', '0/0:a'))
+			.then(() => treeView.reveal({ key: 'aa' })
+				.then(() => {
+					assert.ok(revealTarget.calledOnce);
+					assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
+					assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
+					assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
+					assert.equal(void 0, revealTarget.args[0][3]);
+				}));
+	});
+
 	test('reveal will return parents array for deeper element with no selection', () => {
 		tree = {
 			'b': {

From 6ef45d9332ded9bac37c0ec43a9dd70d165c9acc Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 3 Apr 2018 18:04:09 +0200
Subject: [PATCH 295/383] notifications - more use of prompt() API

---
 .../extensions/browser/extensionsActions.ts   | 123 ++++++------------
 .../electron-browser/extensionsActions.ts     |  16 +--
 .../parts/update/electron-browser/update.ts   |   7 +-
 3 files changed, 44 insertions(+), 102 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index 0d5e207078e..afc0d173ab5 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -48,31 +48,23 @@ import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 
-class DownloadExtensionAction extends Action {
-
-	constructor(
-		private extension: IExtension,
-		@IOpenerService private openerService: IOpenerService,
-		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
-	) {
-		super('extensions.download', localize('download', "Download Manually"), '', true);
-	}
-
-	run(): TPromise<void> {
-		return this.openerService.open(URI.parse(this.extension.downloadUrl)).then(() => {
-			const action = this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
-			const handle = this.notificationService.notify({
-				severity: Severity.Info,
-				message: localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', this.extension.id),
-				actions: {
-					primary: [action]
-				}
+const promptDownloadManually = (extension: IExtension, message: string, instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService) => {
+	notificationService.prompt(Severity.Error, message, [localize('download', "Download Manually")]).done(choice => {
+		if (choice === 0) {
+			openerService.open(URI.parse(extension.downloadUrl)).then(() => {
+				const action = instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
+				const handle = notificationService.notify({
+					severity: Severity.Info,
+					message: localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', extension.id),
+					actions: {
+						primary: [action]
+					}
+				});
+				once(handle.onDidDispose)(() => action.dispose());
 			});
-			once(handle.onDidDispose)(() => action.dispose());
-		});
-	}
-}
+		}
+	});
+};
 
 export class InstallAction extends Action {
 
@@ -90,7 +82,8 @@ export class InstallAction extends Action {
 	constructor(
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService
+		@INotificationService private notificationService: INotificationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super('extensions.install', InstallAction.InstallLabel, InstallAction.Class, false);
 
@@ -133,15 +126,7 @@ export class InstallAction extends Action {
 
 			console.error(err);
 
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToInstall', "Failed to install \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -306,7 +291,8 @@ export class UpdateAction extends Action {
 	constructor(
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService
+		@INotificationService private notificationService: INotificationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super('extensions.update', UpdateAction.Label, UpdateAction.DisabledClass, false);
 
@@ -348,15 +334,8 @@ export class UpdateAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -833,7 +812,8 @@ export class UpdateAllAction extends Action {
 		label = UpdateAllAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super(id, label, '', false);
 
@@ -860,15 +840,8 @@ export class UpdateAllAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -1205,7 +1178,8 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
 		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super(id, label, 'extension-action');
 		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
@@ -1269,15 +1243,8 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToInstall', "Failed to install \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -1300,7 +1267,8 @@ export class InstallRecommendedExtensionAction extends Action {
 		@IViewletService private viewletService: IViewletService,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super(InstallRecommendedExtensionAction.ID, InstallRecommendedExtensionAction.LABEL, null);
 		this.extensionId = extensionId;
@@ -1338,15 +1306,8 @@ export class InstallRecommendedExtensionAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToInstall', "Failed to install \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -1994,17 +1955,9 @@ export class ReinstallAction extends Action {
 	private reinstallExtension(extension: IExtension): TPromise<void> {
 		return this.extensionsWorkbenchService.reinstall(extension)
 			.then(() => {
-				this.notificationService.notify({
-					message: localize('ReinstallAction.success', "Successfully reinstalled the extension."),
-					severity: Severity.Info,
-					actions: {
-						primary: [<IAction>{
-							id: 'reload',
-							label: localize('ReinstallAction.reloadNow', "Reload Now"),
-							enabled: true,
-							run: () => this.windowService.reloadWindow(),
-							dispose: () => null
-						}]
+				this.notificationService.prompt(Severity.Info, localize('ReinstallAction.success', "Successfully reinstalled the extension."), [localize('ReinstallAction.reloadNow', "Reload Now")]).done(choice => {
+					if (choice === 0) {
+						this.windowService.reloadWindow();
 					}
 				});
 			}, error => this.notificationService.error(error));
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
index aa3773bbe87..0b284cca2bd 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
@@ -5,7 +5,7 @@
 
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Action, IAction } from 'vs/base/common/actions';
+import { Action } from 'vs/base/common/actions';
 import * as paths from 'vs/base/common/paths';
 import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/extensions/common/extensions';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -131,17 +131,9 @@ export class ReinstallAction extends Action {
 	private reinstallExtension(extension: IExtension): TPromise<void> {
 		return this.extensionsWorkbenchService.reinstall(extension)
 			.then(() => {
-				this.notificationService.notify({
-					message: localize('ReinstallAction.success', "Successfully reinstalled the extension."),
-					severity: Severity.Info,
-					actions: {
-						primary: [<IAction>{
-							id: 'reload',
-							label: localize('ReinstallAction.reloadNow', "Reload Now"),
-							enabled: true,
-							run: () => this.windowService.reloadWindow(),
-							dispose: () => null
-						}]
+				this.notificationService.prompt(Severity.Info, localize('ReinstallAction.success', "Successfully reinstalled the extension."), [localize('ReinstallAction.reloadNow', "Reload Now")]).done(choice => {
+					if (choice === 0) {
+						this.windowService.reloadWindow();
 					}
 				});
 			}, error => this.notificationService.error(error));
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 93cf12eeb33..4a8dad69dbc 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -143,10 +143,7 @@ export class ProductContribution implements IWorkbenchContribution {
 
 		// should we show the new license?
 		if (product.licenseUrl && lastVersion && semver.satisfies(lastVersion, '<1.0.0') && semver.satisfies(pkg.version, '>=1.0.0')) {
-			notificationService.notify({
-				severity: severity.Info,
-				message: nls.localize('licenseChanged', "Our license terms have changed, please click [here]({0}) to go through them.", product.licenseUrl),
-			});
+			notificationService.info(nls.localize('licenseChanged', "Our license terms have changed, please click [here]({0}) to go through them.", product.licenseUrl));
 		}
 
 		storageService.store(ProductContribution.KEY, pkg.version, StorageScope.GLOBAL);
@@ -392,7 +389,7 @@ export class UpdateContribution implements IGlobalActivity {
 			message: nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", product.nameLong),
 			actions: { primary: [applyUpdateAction, NotNowAction, releaseNotesAction] }
 		});
-		once(handle.onDidDispose)(() => applyUpdateAction, releaseNotesAction);
+		once(handle.onDidDispose)(() => dispose(applyUpdateAction, releaseNotesAction));
 	}
 
 	private shouldShowNotification(): boolean {

From 3bc2728340325c0e2215c998db17f069c1d91719 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 3 Apr 2018 19:51:27 +0200
Subject: [PATCH 296/383] fix test --debug after electron adoption

---
 test/electron/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/electron/index.js b/test/electron/index.js
index aa054f553ca..770bb853d4c 100644
--- a/test/electron/index.js
+++ b/test/electron/index.js
@@ -132,7 +132,7 @@ app.on('ready', () => {
 	win.webContents.on('did-finish-load', () => {
 		if (argv.debug) {
 			win.show();
-			win.webContents.openDevTools('right');
+			win.webContents.openDevTools({ mode: 'right' });
 		}
 		win.webContents.send('run', argv);
 	});

From 691c789ce35a42b78c7c64c87380152c3c5c6f80 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Mon, 2 Apr 2018 16:12:14 -0700
Subject: [PATCH 297/383] Get GPU information in issue reporter, #46960

---
 .../issue/issueReporterMain.ts                |  6 +++-
 .../issue/issueReporterModel.ts               |  6 +++-
 .../issue/test/testReporterModel.test.ts      | 30 +++++++++++++++++++
 src/vs/code/electron-main/diagnostics.ts      | 14 +++++++--
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index d87232cf697..47f1ca1038f 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -771,10 +771,14 @@ export class IssueReporter extends Disposable {
 		const target = document.querySelector('.block-system .block-info');
 		let tableHtml = '';
 		Object.keys(state.systemInfo).forEach(k => {
+			const data = typeof state.systemInfo[k] === 'object'
+				? Object.keys(state.systemInfo[k]).map(key => `${key}: ${state.systemInfo[k][key]}`).join('<br>')
+				: state.systemInfo[k];
+
 			tableHtml += `
 				<tr>
 					<td>${k}</td>
-					<td>${state.systemInfo[k]}</td>
+					<td>${data}</td>
 				</tr>`;
 		});
 		target.innerHTML = `<table>${tableHtml}</table>`;
diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index 43d581ea6a3..e6a7a1aa1f0 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -142,7 +142,11 @@ ${this.getInfos()}
 `;
 
 		Object.keys(this._data.systemInfo).forEach(k => {
-			md += `|${k}|${this._data.systemInfo[k]}|\n`;
+			const data = typeof this._data.systemInfo[k] === 'object'
+				? Object.keys(this._data.systemInfo[k]).map(key => `${key}: ${this._data.systemInfo[k][key]}`).join('<br>')
+				: this._data.systemInfo[k];
+
+			md += `|${k}|${data}|\n`;
 		});
 
 		md += '\n</details>';
diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
index 34c7c07e8a5..c08ab806bf3 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -35,6 +35,36 @@ VS Code version: undefined
 OS version: undefined
 
 
+<!-- generated by issue reporter -->`);
+	});
+
+	test('serializes GPU information when data is provided', () => {
+		const issueReporterModel = new IssueReporterModel({
+			issueType: 0,
+			systemInfo: {
+				'GPU Status': {
+					'2d_canvas': 'enabled',
+					'checker_imaging': 'disabled_off'
+				}
+			}
+		});
+		assert.equal(issueReporterModel.serialize(),
+			`
+Issue Type: <b>Bug</b>
+
+undefined
+
+VS Code version: undefined
+OS version: undefined
+
+<details>
+<summary>System Info</summary>
+
+|Item|Value|
+|---|---|
+|GPU Status|2d_canvas: enabled<br>checker_imaging: disabled_off|
+
+</details>Extensions: none
 <!-- generated by issue reporter -->`);
 	});
 
diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts
index 8de2d49423c..c2d5a003f9f 100644
--- a/src/vs/code/electron-main/diagnostics.ts
+++ b/src/vs/code/electron-main/diagnostics.ts
@@ -29,6 +29,7 @@ export interface SystemInfo {
 	VM: string;
 	'Screen Reader': string;
 	'Process Argv': string;
+	'GPU Status': Electron.GPUFeatureStatus;
 }
 
 export interface ProcessInfo {
@@ -92,7 +93,8 @@ export function getSystemInfo(info: IMainProcessInfo): SystemInfo {
 		'Memory (System)': `${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`,
 		VM: `${Math.round((virtualMachineHint.value() * 100))}%`,
 		'Screen Reader': `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`,
-		'Process Argv': `${info.mainArguments.join(' ')}`
+		'Process Argv': `${info.mainArguments.join(' ')}`,
+		'GPU Status': app.getGPUFeatureStatus()
 	};
 
 	const cpus = os.cpus();
@@ -208,7 +210,14 @@ function formatLaunchConfigs(configs: WorkspaceStatItem[]): string {
 	return output.join('\n');
 }
 
-function formatEnvironment(info: IMainProcessInfo): string {
+function expandGPUFeatures(): string {
+	const gpuFeatures = app.getGPUFeatureStatus();
+	const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length));
+	// Make columns aligned by adding spaces after feature name
+	return Object.keys(gpuFeatures).map(feature => `${feature}:  ${repeat(' ', longestFeatureName - feature.length)}  ${gpuFeatures[feature]}`).join('\n                  ');
+}
+
+export function formatEnvironment(info: IMainProcessInfo): string {
 	const MB = 1024 * 1024;
 	const GB = 1024 * MB;
 
@@ -226,6 +235,7 @@ function formatEnvironment(info: IMainProcessInfo): string {
 	output.push(`VM:               ${Math.round((virtualMachineHint.value() * 100))}%`);
 	output.push(`Screen Reader:    ${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`);
 	output.push(`Process Argv:     ${info.mainArguments.join(' ')}`);
+	output.push(`GPU Status:       ${expandGPUFeatures()}`);
 
 	return output.join('\n');
 }

From 244c39c94ef440168e0a565f9a82b1e6f47cd182 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 3 Apr 2018 11:09:49 -0700
Subject: [PATCH 298/383] Fix #47155

---
 src/vs/workbench/parts/search/browser/searchResultsView.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index 1d78469272a..1577ee03f22 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -344,10 +344,12 @@ export class SearchAccessibilityProvider implements IAccessibilityProvider {
 			const replace = searchModel.isReplaceActive() && !!searchModel.replaceString;
 			const matchString = match.getMatchString();
 			const range = match.range();
+			const matchText = match.text().substr(0, range.endColumn + 150);
 			if (replace) {
-				return nls.localize('replacePreviewResultAria', "Replace term {0} with {1} at column position {2} in line with text {3}", matchString, match.replaceString, range.startColumn + 1, match.text());
+				return nls.localize('replacePreviewResultAria', "Replace term {0} with {1} at column position {2} in line with text {3}", matchString, match.replaceString, range.startColumn + 1, matchText);
 			}
-			return nls.localize('searchResultAria', "Found term {0} at column position {1} in line with text {2}", matchString, range.startColumn + 1, match.text());
+
+			return nls.localize('searchResultAria', "Found term {0} at column position {1} in line with text {2}", matchString, range.startColumn + 1, matchText);
 		}
 		return undefined;
 	}

From cf87ba36c0d62c3a9d77da5f96a5c24c9d87a122 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 3 Apr 2018 11:35:29 -0700
Subject: [PATCH 299/383] Fix #47157 - Focus include/exclude box when toggling
 open

---
 src/vs/workbench/parts/search/browser/searchView.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 1626a1441f3..67002a97b86 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -191,13 +191,13 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			builder.div({ 'class': 'more', 'tabindex': 0, 'role': 'button', 'title': nls.localize('moreSearch', "Toggle Search Details") })
 				.on(dom.EventType.CLICK, (e) => {
 					dom.EventHelper.stop(e);
-					this.toggleQueryDetails(true);
+					this.toggleQueryDetails();
 				}).on(dom.EventType.KEY_UP, (e: KeyboardEvent) => {
 					let event = new StandardKeyboardEvent(e);
 
 					if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 						dom.EventHelper.stop(e);
-						this.toggleQueryDetails();
+						this.toggleQueryDetails(false);
 					}
 				});
 
@@ -879,7 +879,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.onQueryChanged(true, true);
 	}
 
-	public toggleQueryDetails(moveFocus?: boolean, show?: boolean, skipLayout?: boolean): void {
+	public toggleQueryDetails(moveFocus = true, show?: boolean, skipLayout?: boolean): void {
 		let cls = 'more';
 		show = typeof show === 'undefined' ? !dom.hasClass(this.queryDetails, cls) : Boolean(show);
 		this.viewletSettings['query.queryDetailsExpanded'] = show;

From a01215580c5cafb215c2cb1669bf7a616a92eab6 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 3 Apr 2018 11:48:49 -0700
Subject: [PATCH 300/383] Show notification when running with extensions
 disabled, fixes #46817

---
 .../services/extensions/electron-browser/extensionService.ts  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 0423ebbecc4..b4ec2e94433 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -299,6 +299,10 @@ export class ExtensionService extends Disposable implements IExtensionService {
 
 		this._extensionHostProcessManager = null;
 		this.startDelayed(lifecycleService);
+
+		if (this._environmentService.disableExtensions) {
+			this._notificationService.info(nls.localize('extensionsDisabled', "All extensions are disabled."));
+		}
 	}
 
 	private startDelayed(lifecycleService: ILifecycleService): void {

From 21ec23c075a563775789597b1c8e6378e2c20c02 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 3 Apr 2018 22:02:59 +0200
Subject: [PATCH 301/383] [css] enable strict on server

---
 .../server/src/cssServerMain.ts               | 49 +++++++++----------
 .../server/src/test/completion.test.ts        |  2 +-
 .../server/src/test/emmet.test.ts             | 10 ++--
 .../server/src/utils/errors.ts                | 33 -------------
 .../server/src/utils/runner.ts                | 47 ++++++++++++++++++
 .../server/tsconfig.json                      |  3 +-
 6 files changed, 79 insertions(+), 65 deletions(-)
 delete mode 100644 extensions/css-language-features/server/src/utils/errors.ts
 create mode 100644 extensions/css-language-features/server/src/utils/runner.ts

diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts
index 75223f91b78..aba96f5ff6a 100644
--- a/extensions/css-language-features/server/src/cssServerMain.ts
+++ b/extensions/css-language-features/server/src/cssServerMain.ts
@@ -5,15 +5,14 @@
 'use strict';
 
 import {
-	createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities,
-	ConfigurationRequest, WorkspaceFolder, DocumentColorRequest, ColorPresentationRequest
+	createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities, ConfigurationRequest, WorkspaceFolder
 } from 'vscode-languageserver';
 
 import { TextDocument, CompletionList } from 'vscode-languageserver-types';
 
 import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet } from 'vscode-css-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
-import { formatError, runSafe } from './utils/errors';
+import { formatError, runSafe } from './utils/runner';
 import URI from 'vscode-uri';
 import { getPathCompletionParticipant } from './pathCompletion';
 import { FoldingProviderServerCapabilities, FoldingRangesRequest } from 'vscode-languageserver-protocol-foldingprovider';
@@ -182,7 +181,7 @@ function validateTextDocument(textDocument: TextDocument): void {
 	});
 }
 
-connection.onCompletion(textDocumentPosition => {
+connection.onCompletion((textDocumentPosition, token) => {
 	return runSafe(() => {
 		let document = documents.get(textDocumentPosition.textDocument.uri);
 		const cssLS = getLanguageService(document);
@@ -196,58 +195,58 @@ connection.onCompletion(textDocumentPosition => {
 			isIncomplete: result.isIncomplete,
 			items: [...pathCompletionList.items, ...result.items]
 		};
-	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`);
+	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`, token);
 });
 
-connection.onHover(textDocumentPosition => {
+connection.onHover((textDocumentPosition, token) => {
 	return runSafe(() => {
 		let document = documents.get(textDocumentPosition.textDocument.uri);
 		let styleSheet = stylesheets.get(document);
-		return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet)!; /* TODO: remove ! once LS has null annotations */
-	}, null, `Error while computing hover for ${textDocumentPosition.textDocument.uri}`);
+		return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet);
+	}, null, `Error while computing hover for ${textDocumentPosition.textDocument.uri}`, token);
 });
 
-connection.onDocumentSymbol(documentSymbolParams => {
+connection.onDocumentSymbol((documentSymbolParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(documentSymbolParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findDocumentSymbols(document, stylesheet);
-	}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`);
+	}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
 });
 
-connection.onDefinition(documentSymbolParams => {
+connection.onDefinition((documentSymbolParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(documentSymbolParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findDefinition(document, documentSymbolParams.position, stylesheet);
-	}, null, `Error while computing definitions for ${documentSymbolParams.textDocument.uri}`);
+	}, null, `Error while computing definitions for ${documentSymbolParams.textDocument.uri}`, token);
 });
 
-connection.onDocumentHighlight(documentSymbolParams => {
+connection.onDocumentHighlight((documentSymbolParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(documentSymbolParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findDocumentHighlights(document, documentSymbolParams.position, stylesheet);
-	}, [], `Error while computing document highlights for ${documentSymbolParams.textDocument.uri}`);
+	}, [], `Error while computing document highlights for ${documentSymbolParams.textDocument.uri}`, token);
 });
 
-connection.onReferences(referenceParams => {
+connection.onReferences((referenceParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(referenceParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findReferences(document, referenceParams.position, stylesheet);
-	}, [], `Error while computing references for ${referenceParams.textDocument.uri}`);
+	}, [], `Error while computing references for ${referenceParams.textDocument.uri}`, token);
 });
 
-connection.onCodeAction(codeActionParams => {
+connection.onCodeAction((codeActionParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(codeActionParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).doCodeActions(document, codeActionParams.range, codeActionParams.context, stylesheet);
-	}, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`);
+	}, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`, token);
 });
 
-connection.onRequest(DocumentColorRequest.type, params => {
+connection.onDocumentColor((params, token) => {
 	return runSafe(() => {
 		let document = documents.get(params.textDocument.uri);
 		if (document) {
@@ -255,10 +254,10 @@ connection.onRequest(DocumentColorRequest.type, params => {
 			return getLanguageService(document).findDocumentColors(document, stylesheet);
 		}
 		return [];
-	}, [], `Error while computing document colors for ${params.textDocument.uri}`);
+	}, [], `Error while computing document colors for ${params.textDocument.uri}`, token);
 });
 
-connection.onRequest(ColorPresentationRequest.type, params => {
+connection.onColorPresentation((params, token) => {
 	return runSafe(() => {
 		let document = documents.get(params.textDocument.uri);
 		if (document) {
@@ -266,15 +265,15 @@ connection.onRequest(ColorPresentationRequest.type, params => {
 			return getLanguageService(document).getColorPresentations(document, stylesheet, params.color, params.range);
 		}
 		return [];
-	}, [], `Error while computing color presentations for ${params.textDocument.uri}`);
+	}, [], `Error while computing color presentations for ${params.textDocument.uri}`, token);
 });
 
-connection.onRenameRequest(renameParameters => {
+connection.onRenameRequest((renameParameters, token) => {
 	return runSafe(() => {
 		let document = documents.get(renameParameters.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).doRename(document, renameParameters.position, renameParameters.newName, stylesheet);
-	}, null, `Error while computing renames for ${renameParameters.textDocument.uri}`);
+	}, null, `Error while computing renames for ${renameParameters.textDocument.uri}`, token);
 });
 
 connection.onRequest(FoldingRangesRequest.type, (params, token) => {
@@ -282,7 +281,7 @@ connection.onRequest(FoldingRangesRequest.type, (params, token) => {
 		let document = documents.get(params.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findFoldingRegions(document, stylesheet);
-	}, null, `Error while computing folding ranges for ${params.textDocument.uri}`);
+	}, null, `Error while computing folding ranges for ${params.textDocument.uri}`, token);
 });
 
 // Listen on the connection
diff --git a/extensions/css-language-features/server/src/test/completion.test.ts b/extensions/css-language-features/server/src/test/completion.test.ts
index 86f57ca523d..23fc5e0e3b1 100644
--- a/extensions/css-language-features/server/src/test/completion.test.ts
+++ b/extensions/css-language-features/server/src/test/completion.test.ts
@@ -48,7 +48,7 @@ suite('Completions', () => {
 		cssLanguageService.setCompletionParticipants([getPathCompletionParticipant(document, workspaceFolders, participantResult)]);
 
 		const stylesheet = cssLanguageService.parseStylesheet(document);
-		let list = cssLanguageService.doComplete!(document, position, stylesheet);
+		let list = cssLanguageService.doComplete(document, position, stylesheet)!;
 		list.items = list.items.concat(participantResult.items);
 
 		if (expected.count) {
diff --git a/extensions/css-language-features/server/src/test/emmet.test.ts b/extensions/css-language-features/server/src/test/emmet.test.ts
index 7c850fe2697..e7fe76d7be3 100644
--- a/extensions/css-language-features/server/src/test/emmet.test.ts
+++ b/extensions/css-language-features/server/src/test/emmet.test.ts
@@ -15,7 +15,7 @@ suite('CSS Emmet Support', () => {
 	const cssLanguageService = getCSSLanguageService();
 	const scssLanguageService = getSCSSLanguageService();
 
-	function assertCompletions(syntax: string, value: string, expectedProposal: string, expectedProposalDoc: string): void {
+	function assertCompletions(syntax: string, value: string, expectedProposal: string | null, expectedProposalDoc: string | null): void {
 		const offset = value.indexOf('|');
 		value = value.substr(0, offset) + value.substr(offset + 1);
 
@@ -23,12 +23,12 @@ suite('CSS Emmet Support', () => {
 		const position = document.positionAt(offset);
 		const emmetCompletionList: CompletionList = {
 			isIncomplete: true,
-			items: undefined
+			items: []
 		};
 		const languageService = syntax === 'scss' ? scssLanguageService : cssLanguageService;
 		languageService.setCompletionParticipants([getEmmetCompletionParticipants(document, position, document.languageId, {}, emmetCompletionList)]);
 		const stylesheet = languageService.parseStylesheet(document);
-		const list = languageService.doComplete!(document, position, stylesheet);
+		const list = languageService.doComplete(document, position, stylesheet);
 
 		assert.ok(list);
 		assert.ok(emmetCompletionList);
@@ -43,7 +43,7 @@ suite('CSS Emmet Support', () => {
 		}
 	}
 
-	test('Css Emmet Completions', function (): any {
+	test('Css Emmet Completions', function (this: any): any {
 		this.skip(); // disabled again (see #29113)
 
 		assertCompletions('css', '.foo { display: none; m10| }', 'margin: 10px;', 'margin: 10px;');
@@ -56,7 +56,7 @@ suite('CSS Emmet Support', () => {
 		assertCompletions('css', '.foo { display: none; -m-m10| }', 'margin: 10px;', '-moz-margin: 10px;\nmargin: 10px;');
 	});
 
-	test('Scss Emmet Completions', function (): any {
+	test('Scss Emmet Completions', function (this: any): any {
 		this.skip(); // disabled again (see #29113)
 
 		assertCompletions('scss', '.foo { display: none; .bar { m10| } }', 'margin: 10px;', 'margin: 10px;');
diff --git a/extensions/css-language-features/server/src/utils/errors.ts b/extensions/css-language-features/server/src/utils/errors.ts
deleted file mode 100644
index d5a0c8e7d05..00000000000
--- a/extensions/css-language-features/server/src/utils/errors.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-export function formatError(message: string, err: any): string {
-	if (err instanceof Error) {
-		let error = <Error>err;
-		return `${message}: ${error.message}\n${error.stack}`;
-	} else if (typeof err === 'string') {
-		return `${message}: ${err}`;
-	} else if (err) {
-		return `${message}: ${err.toString()}`;
-	}
-	return message;
-}
-
-export function runSafe<T>(func: () => Thenable<T> | T, errorVal: T, errorMessage: string): Thenable<T> | T {
-	try {
-		let t = func();
-		if (t instanceof Promise) {
-			return t.then(void 0, e => {
-				console.error(formatError(errorMessage, e));
-				return errorVal;
-			});
-		}
-		return t;
-	} catch (e) {
-		console.error(formatError(errorMessage, e));
-		return errorVal;
-	}
-}
\ No newline at end of file
diff --git a/extensions/css-language-features/server/src/utils/runner.ts b/extensions/css-language-features/server/src/utils/runner.ts
new file mode 100644
index 00000000000..273194ce431
--- /dev/null
+++ b/extensions/css-language-features/server/src/utils/runner.ts
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { ResponseError, ErrorCodes, CancellationToken } from 'vscode-languageserver';
+
+export function formatError(message: string, err: any): string {
+	if (err instanceof Error) {
+		let error = <Error>err;
+		return `${message}: ${error.message}\n${error.stack}`;
+	} else if (typeof err === 'string') {
+		return `${message}: ${err}`;
+	} else if (err) {
+		return `${message}: ${err.toString()}`;
+	}
+	return message;
+}
+
+export function runSafe<T, E>(func: () => T, errorVal: T, errorMessage: string, token: CancellationToken): Thenable<T | ResponseError<E>> {
+	return new Promise<T | ResponseError<E>>((resolve, reject) => {
+		setImmediate(() => {
+			if (token.isCancellationRequested) {
+				resolve(cancelValue());
+			} else {
+				try {
+					let result = func();
+					if (token.isCancellationRequested) {
+						resolve(cancelValue());
+						return;
+					} else {
+						resolve(result);
+					}
+
+				} catch (e) {
+					console.error(formatError(errorMessage, e));
+					resolve(errorVal);
+				}
+			}
+		});
+	});
+}
+
+function cancelValue<E>() {
+	return new ResponseError<E>(ErrorCodes.RequestCancelled, 'Request cancelled');
+}
diff --git a/extensions/css-language-features/server/tsconfig.json b/extensions/css-language-features/server/tsconfig.json
index dc12dad6cf0..7f8b647d04b 100644
--- a/extensions/css-language-features/server/tsconfig.json
+++ b/extensions/css-language-features/server/tsconfig.json
@@ -6,7 +6,8 @@
 		"noUnusedLocals": true,
 		"lib": [
 			"es5", "es2015.promise"
-		]
+		],
+		"strict": true
 	},
 	"include": [
 		"src/**/*"

From e8125cf26754ba7354e6bc5bb17fdd8eed9c8b46 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 3 Apr 2018 15:32:07 -0700
Subject: [PATCH 302/383] Fixes #46844

---
 src/vs/code/electron-browser/issue/issueReporterMain.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 47f1ca1038f..fe645528c44 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -447,7 +447,7 @@ export class IssueReporter extends Disposable {
 	}
 
 	private searchVSCodeIssues(title: string, issueDescription: string): void {
-		if (title || issueDescription) {
+		if (title) {
 			this.searchDuplicates(title, issueDescription);
 		} else {
 			this.clearSearchResults();
@@ -578,7 +578,7 @@ export class IssueReporter extends Disposable {
 			similarIssues.appendChild(issues);
 		} else {
 			const message = $('div.list-title');
-			message.textContent = localize('noResults', "No results found");
+			message.textContent = localize('noSimilarIssues', "No similar issues found");
 			similarIssues.appendChild(message);
 		}
 	}

From 2880f8e173b748ebc81efe97fe3b634ea74af336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Weinand?= <aweinand@microsoft.com>
Date: Wed, 4 Apr 2018 00:54:49 +0200
Subject: [PATCH 303/383] node-debug@1.23.1

---
 build/builtInExtensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index ccd151d7d3d..4bd1d55b0b7 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.22.13",
+		"version": "1.23.1",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{

From de6653a997242ce0baa7d2f59f0a8e5c73d8d5a0 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Tue, 3 Apr 2018 16:40:58 -0700
Subject: [PATCH 304/383] Retain paths starting from node_modules  and match
 escaped backslashes

---
 .../telemetry/common/telemetryService.ts      |  7 +-
 .../electron-browser/telemetryService.test.ts | 82 ++++++++++++++++---
 2 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 2f713dd11af..992f3e36a96 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -130,15 +130,16 @@ export class TelemetryService implements ITelemetryService {
 			}
 		}
 
-		const fileRegex = /(file:\/\/)?([a-z,A-Z]:)?([\\\/]\w+)+/g;
+		const nodeModulesRegex = /^[\\\/]?(node_modules|node_modules\.asar)[\\\/]/;
+		const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w-\._]+(\\\\|\\|\/))+[\w-\._]*/g;
 		let updatedStack = stack;
 		while (true) {
 			const result = fileRegex.exec(stack);
 			if (!result) {
 				break;
 			}
-			// Anoynimize user file paths that do not need cleanup.
-			if (cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
+			// Anoynimize user file paths that do not need to be retained or cleaned up.
+			if (!nodeModulesRegex.test(result[0]) && cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
 				updatedStack = updatedStack.slice(0, result.index) + result[0].replace(/./g, 'a') + updatedStack.slice(fileRegex.lastIndex);
 			}
 		}
diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
index d3062bc7ff2..39fe577f0e5 100644
--- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -50,8 +50,10 @@ class ErrorTestingSettings {
 	public noSuchFilePrefix: string;
 	public noSuchFileMessage: string;
 	public stack: string[];
-	public randomUserFile: string = 'a/path/that/doesnt/contain/code/names';
-	public anonymizedRandomUserFile: string = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+	public randomUserFile: string = 'a/path/that/doe_snt/con-tain/code/names.js';
+	public anonymizedRandomUserFile: string = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+	public nodeModulePathToRetain: string = 'node_modules/path/that/shouldbe/retained/names.js:14:15854';
+	public nodeModuleAsarPathToRetain: string = 'node_modules.asar/path/that/shouldbe/retained/names.js:14:12354';
 
 	constructor() {
 		this.personalInfo = 'DANGEROUS/PATH';
@@ -66,16 +68,16 @@ class ErrorTestingSettings {
 		this.noSuchFilePrefix = 'ENOENT: no such file or directory';
 		this.noSuchFileMessage = this.noSuchFilePrefix + ' \'' + this.personalInfo + '\'';
 
-		this.stack = [`at e._modelEvents (${this.randomUserFile}.js:11:7309)`,
-		`    at t.AllWorkers (${this.randomUserFile}.js:6:8844)`,
-		`    at e.(anonymous function) [as _modelEvents] (${this.randomUserFile}.js:5:29552)`,
-		`    at Function.<anonymous> (${this.randomUserFile}.js:6:8272)`,
-		`    at e.dispatch (${this.randomUserFile}.js:5:26931)`,
-		`    at e.request (${this.randomUserFile}.js:14:1745)`,
-			'    at t._handleMessage (another/path/that/doesnt/contain/code/names.js:14:17447)',
-			'    at t._onmessage (another/path/that/doesnt/contain/code/names.js:14:16976)',
-			'    at t.onmessage (another/path/that/doesnt/contain/code/names.js:14:15854)',
-			'    at DedicatedWorkerGlobalScope.self.onmessage',
+		this.stack = [`at e._modelEvents (${this.randomUserFile}:11:7309)`,
+		`    at t.AllWorkers (${this.randomUserFile}:6:8844)`,
+		`    at e.(anonymous function) [as _modelEvents] (${this.randomUserFile}:5:29552)`,
+		`    at Function.<anonymous> (${this.randomUserFile}:6:8272)`,
+		`    at e.dispatch (${this.randomUserFile}:5:26931)`,
+		`    at e.request (/${this.nodeModuleAsarPathToRetain})`,
+		`    at t._handleMessage (${this.nodeModuleAsarPathToRetain})`,
+		`    at t._onmessage (/${this.nodeModulePathToRetain})`,
+		`    at t.onmessage (${this.nodeModulePathToRetain})`,
+			`    at DedicatedWorkerGlobalScope.self.onmessage`,
 		this.dangerousPathWithImportantInfo,
 		this.dangerousPathWithoutImportantInfo,
 		this.missingModelMessage,
@@ -461,6 +463,62 @@ suite('TelemetryService', () => {
 		service.dispose();
 	}));
 
+	test('Unexpected Error Telemetry removes PII but preserves Code file path with node modules', sinon.test(function (this: any) {
+
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
+
+		try {
+			let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
+
+			let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
+			dangerousPathWithImportantInfoError.stack = settings.stack;
+
+
+			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+			assert.notEqual(testAppender.events[0].data.stack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf('(' + settings.nodeModulePathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.stack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+
+			errorTelemetry.dispose();
+			service.dispose();
+		}
+		finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
+	}));
+
+	test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
+		window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
+
+		let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
+		dangerousPathWithImportantInfoError.stack = settings.stack;
+		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+		assert.equal(errorStub.callCount, 1);
+
+		assert.notEqual(testAppender.events[0].data.stack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.stack.indexOf('(' + settings.nodeModulePathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.stack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.stack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+
+		errorTelemetry.dispose();
+		service.dispose();
+	}));
+
+
 	test('Unexpected Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
 
 		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();

From 1dcb420e69d5c1cefc003045e80d6b7ca6610f2c Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 3 Apr 2018 15:10:37 -0700
Subject: [PATCH 305/383] #8594 - implement copy path context menu item

---
 .../parts/search/browser/searchActions.ts     | 12 +++++++++
 .../parts/search/browser/searchResultsView.ts |  4 ++-
 .../parts/search/common/constants.ts          |  2 ++
 .../electron-browser/search.contribution.ts   | 27 ++++++++++++++++---
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 868a64b10a7..94a6efb8886 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -22,6 +22,10 @@ import { OS } from 'vs/base/common/platform';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { VIEW_ID } from 'vs/platform/search/common/search';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { ICommandHandler } from 'vs/platform/commands/common/commands';
+import { Schemas } from 'vs/base/common/network';
+import { getPathLabel } from 'vs/base/common/labels';
 
 export function isSearchViewFocused(viewletService: IViewletService, panelService: IPanelService): boolean {
 	let searchView = getSearchView(viewletService, panelService);
@@ -630,3 +634,11 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 		return false;
 	}
 }
+
+export const copyPathCommand: ICommandHandler = (accessor, fileMatch: FileMatch) => {
+	const clipboardService = accessor.get(IClipboardService);
+
+	const resource = fileMatch.resource();
+	const text = resource.scheme === Schemas.file ? getPathLabel(resource) : resource.toString();
+	clipboardService.writeText(text);
+};
diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index 1577ee03f22..4515d7d943d 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -388,7 +388,9 @@ export class SearchTreeController extends WorkbenchTreeController {
 				const actions: IAction[] = [];
 				fillInActions(this.contextMenu, { shouldForwardArgs: true }, actions, this.contextMenuService);
 				return TPromise.as(actions);
-			}
+			},
+
+			getActionsContext: () => element
 		});
 
 		return true;
diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts
index fe9c22e0725..a2e93246ec6 100644
--- a/src/vs/workbench/parts/search/common/constants.ts
+++ b/src/vs/workbench/parts/search/common/constants.ts
@@ -12,6 +12,8 @@ export const FocusSearchFromResults = 'search.action.focusSearchFromResults';
 export const OpenMatchToSide = 'search.action.openResultToSide';
 export const CancelActionId = 'search.action.cancel';
 export const RemoveActionId = 'search.action.remove';
+export const CopyPathCommandId = 'search.action.copyPath';
+export const CopyMatchCommandId = 'search.action.copyMatch';
 export const ReplaceActionId = 'search.action.replace';
 export const ReplaceAllInFileActionId = 'search.action.replaceAllInFile';
 export const ReplaceAllInFolderActionId = 'search.action.replaceAllInFolder';
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index e26158e086f..1715c84ce87 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -53,12 +53,12 @@ import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/file
 import { Schemas } from 'vs/base/common/network';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction } from 'vs/workbench/parts/search/browser/searchActions';
+import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand } from 'vs/workbench/parts/search/browser/searchActions';
 import { VIEW_ID, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { SearchViewLocationUpdater } from 'vs/workbench/parts/search/browser/searchViewLocationUpdater';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 registerSingleton(ISearchWorkbenchService, SearchWorkbenchService);
 replaceContributions();
@@ -235,6 +235,27 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	order: 2
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: Constants.CopyPathCommandId,
+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	when: Constants.FileFocusKey,
+	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_C,
+	win: {
+		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C
+	},
+	handler: copyPathCommand
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.CopyPathCommandId,
+		title: nls.localize('copyPathLabel', "Copy Path")
+	},
+	when: Constants.FileFocusKey,
+	group: 'search',
+	order: 3
+});
+
 CommandsRegistry.registerCommand({
 	id: Constants.ToggleSearchViewPositionCommandId,
 	handler: (accessor) => {
@@ -254,7 +275,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	},
 	when: Constants.SearchViewVisibleKey,
 	group: 'search_2',
-	order: 3
+	order: 1
 });
 
 const FIND_IN_FOLDER_ID = 'filesExplorer.findInFolder';

From c8a6ce937b6efd31343c03f3e8eb48f9a005c599 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 3 Apr 2018 16:45:21 -0700
Subject: [PATCH 306/383] Fix #42120 - Implement Copy

---
 .../parts/search/browser/searchActions.ts     | 58 ++++++++++++++++++-
 .../electron-browser/search.contribution.ts   | 26 +++++++--
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 94a6efb8886..8d421e4391b 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -18,7 +18,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { ResolvedKeybinding, createKeybinding } from 'vs/base/common/keyCodes';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { OS } from 'vs/base/common/platform';
+import { OS, isWindows } from 'vs/base/common/platform';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { VIEW_ID } from 'vs/platform/search/common/search';
@@ -635,10 +635,62 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 	}
 }
 
+function fileMatchUriToString(fileMatch: FileMatch): string {
+	const resource = fileMatch.resource();
+	return resource.scheme === Schemas.file ? getPathLabel(resource) : resource.toString();
+}
+
 export const copyPathCommand: ICommandHandler = (accessor, fileMatch: FileMatch) => {
 	const clipboardService = accessor.get(IClipboardService);
 
-	const resource = fileMatch.resource();
-	const text = resource.scheme === Schemas.file ? getPathLabel(resource) : resource.toString();
+	const text = fileMatchUriToString(fileMatch);
 	clipboardService.writeText(text);
 };
+
+function matchToString(match: Match): string {
+	return `${match.range().startLineNumber},${match.range().startColumn}: ${match.text()}`;
+}
+
+const lineDelimiter = isWindows ? '\r\n' : '\n';
+function fileMatchToString(fileMatch: FileMatch, maxMatches: number): { text: string, count: number } {
+	const matchTextRows = fileMatch.matches()
+		.slice(0, maxMatches)
+		.map(matchToString)
+		.map(matchText => '  ' + matchText);
+
+	return {
+		text: `${fileMatchUriToString(fileMatch)}${lineDelimiter}${matchTextRows.join(lineDelimiter)}`,
+		count: matchTextRows.length
+	};
+}
+
+function folderMatchToString(folderMatch: FolderMatch, maxMatches: number): string {
+	const fileResults: string[] = [];
+	let numMatches = 0;
+
+	for (let i = 0; i < folderMatch.fileCount() && numMatches < maxMatches; i++) {
+		const fileResult = fileMatchToString(folderMatch.matches()[i], maxMatches - numMatches);
+		numMatches += fileResult.count;
+		fileResults.push(fileResult.text);
+	}
+
+	return fileResults.join(lineDelimiter + lineDelimiter);
+}
+
+const maxClipboardMatches = 1e4;
+export const copyMatchCommand: ICommandHandler = (accessor, match: RenderableMatch) => {
+	const clipboardService = accessor.get(IClipboardService);
+
+	let text: string;
+	if (match instanceof Match) {
+		text = matchToString(match);
+	} else if (match instanceof FileMatch) {
+		text = fileMatchToString(match, maxClipboardMatches).text;
+	} else if (match instanceof FolderMatch) {
+		text = folderMatchToString(match, maxClipboardMatches);
+	}
+
+	if (text) {
+		clipboardService.writeText(text);
+	}
+};
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index 1715c84ce87..8443056e9c3 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -53,7 +53,7 @@ import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/file
 import { Schemas } from 'vs/base/common/network';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand } from 'vs/workbench/parts/search/browser/searchActions';
+import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand, copyMatchCommand } from 'vs/workbench/parts/search/browser/searchActions';
 import { VIEW_ID, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -235,6 +235,24 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	order: 2
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: Constants.CopyMatchCommandId,
+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	when: Constants.FileMatchOrMatchFocusKey,
+	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
+	handler: copyMatchCommand
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.CopyMatchCommandId,
+		title: nls.localize('copyMatchLabel', "Copy")
+	},
+	when: Constants.FileMatchOrMatchFocusKey,
+	group: 'search_2',
+	order: 3
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CopyPathCommandId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -252,8 +270,8 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 		title: nls.localize('copyPathLabel', "Copy Path")
 	},
 	when: Constants.FileFocusKey,
-	group: 'search',
-	order: 3
+	group: 'search_2',
+	order: 4
 });
 
 CommandsRegistry.registerCommand({
@@ -274,7 +292,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 		title: toggleSearchViewPositionLabel
 	},
 	when: Constants.SearchViewVisibleKey,
-	group: 'search_2',
+	group: 'search_9',
 	order: 1
 });
 

From e9262fb5a888d621c88e97e5e7f4f5d4a7bda5c9 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 3 Apr 2018 17:27:28 -0700
Subject: [PATCH 307/383] #8594 - Fix Copy Path on folder nodes

---
 src/vs/workbench/parts/search/browser/searchActions.ts | 10 +++++-----
 src/vs/workbench/parts/search/browser/searchView.ts    |  6 ++++--
 src/vs/workbench/parts/search/common/constants.ts      |  3 ++-
 .../search/electron-browser/search.contribution.ts     |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 8d421e4391b..29af3475e47 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -26,6 +26,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { ICommandHandler } from 'vs/platform/commands/common/commands';
 import { Schemas } from 'vs/base/common/network';
 import { getPathLabel } from 'vs/base/common/labels';
+import URI from 'vs/base/common/uri';
 
 export function isSearchViewFocused(viewletService: IViewletService, panelService: IPanelService): boolean {
 	let searchView = getSearchView(viewletService, panelService);
@@ -635,15 +636,14 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 	}
 }
 
-function fileMatchUriToString(fileMatch: FileMatch): string {
-	const resource = fileMatch.resource();
+function uriToClipboardString(resource: URI): string {
 	return resource.scheme === Schemas.file ? getPathLabel(resource) : resource.toString();
 }
 
-export const copyPathCommand: ICommandHandler = (accessor, fileMatch: FileMatch) => {
+export const copyPathCommand: ICommandHandler = (accessor, fileMatch: FileMatch | FolderMatch) => {
 	const clipboardService = accessor.get(IClipboardService);
 
-	const text = fileMatchUriToString(fileMatch);
+	const text = uriToClipboardString(fileMatch.resource());
 	clipboardService.writeText(text);
 };
 
@@ -659,7 +659,7 @@ function fileMatchToString(fileMatch: FileMatch, maxMatches: number): { text: st
 		.map(matchText => '  ' + matchText);
 
 	return {
-		text: `${fileMatchUriToString(fileMatch)}${lineDelimiter}${matchTextRows.join(lineDelimiter)}`,
+		text: `${uriToClipboardString(fileMatch.resource())}${lineDelimiter}${matchTextRows.join(lineDelimiter)}`,
 		count: matchTextRows.length
 	};
 }
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 67002a97b86..b216b8bb235 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -82,6 +82,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	private inputPatternIncludesFocused: IContextKey<boolean>;
 	private firstMatchFocused: IContextKey<boolean>;
 	private fileMatchOrMatchFocused: IContextKey<boolean>;
+	private fileMatchOrFolderMatchFocus: IContextKey<boolean>;
 	private fileMatchFocused: IContextKey<boolean>;
 	private folderMatchFocused: IContextKey<boolean>;
 	private matchFocused: IContextKey<boolean>;
@@ -137,6 +138,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.inputPatternIncludesFocused = Constants.PatternIncludesFocusedKey.bindTo(this.contextKeyService);
 		this.firstMatchFocused = Constants.FirstMatchFocusKey.bindTo(contextKeyService);
 		this.fileMatchOrMatchFocused = Constants.FileMatchOrMatchFocusKey.bindTo(contextKeyService);
+		this.fileMatchOrFolderMatchFocus = Constants.FileMatchOrFolderMatchFocusKey.bindTo(contextKeyService);
 		this.fileMatchFocused = Constants.FileFocusKey.bindTo(contextKeyService);
 		this.folderMatchFocused = Constants.FolderFocusKey.bindTo(contextKeyService);
 		this.matchFocused = Constants.MatchFocusKey.bindTo(this.contextKeyService);
@@ -535,6 +537,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 					this.fileMatchFocused.set(focus instanceof FileMatch);
 					this.folderMatchFocused.set(focus instanceof FolderMatch);
 					this.matchFocused.set(focus instanceof Match);
+					this.fileMatchOrFolderMatchFocus.set(focus instanceof FileMatch || focus instanceof FolderMatch);
 				}
 			}));
 
@@ -545,9 +548,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				this.fileMatchFocused.reset();
 				this.folderMatchFocused.reset();
 				this.matchFocused.reset();
+				this.fileMatchOrFolderMatchFocus.reset();
 			}));
-
-
 		});
 	}
 
diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts
index a2e93246ec6..78eb76c2af5 100644
--- a/src/vs/workbench/parts/search/common/constants.ts
+++ b/src/vs/workbench/parts/search/common/constants.ts
@@ -34,7 +34,8 @@ export const ReplaceActiveKey = new RawContextKey<boolean>('replaceActive', fals
 export const HasSearchResults = new RawContextKey<boolean>('hasSearchResult', false);
 
 export const FirstMatchFocusKey = new RawContextKey<boolean>('firstMatchFocus', false);
-export const FileMatchOrMatchFocusKey = new RawContextKey<boolean>('fileMatchOrMatchFocus', false);
+export const FileMatchOrMatchFocusKey = new RawContextKey<boolean>('fileMatchOrMatchFocus', false); // This is actually, Match or File or Folder
+export const FileMatchOrFolderMatchFocusKey = new RawContextKey<boolean>('fileMatchOrFolderMatchFocus', false);
 export const FileFocusKey = new RawContextKey<boolean>('fileMatchFocus', false);
 export const FolderFocusKey = new RawContextKey<boolean>('folderMatchFocus', false);
 export const MatchFocusKey = new RawContextKey<boolean>('matchFocus', false);
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index 8443056e9c3..30341762f4c 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -256,7 +256,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CopyPathCommandId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-	when: Constants.FileFocusKey,
+	when: Constants.FileMatchOrFolderMatchFocusKey,
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_C,
 	win: {
 		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C
@@ -269,7 +269,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 		id: Constants.CopyPathCommandId,
 		title: nls.localize('copyPathLabel', "Copy Path")
 	},
-	when: Constants.FileFocusKey,
+	when: Constants.FileMatchOrFolderMatchFocusKey,
 	group: 'search_2',
 	order: 4
 });

From c7b37f59157e6f228c837299a3c5f31d9880d91d Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 3 Apr 2018 17:53:56 -0700
Subject: [PATCH 308/383] #42120 - Implement Copy All

---
 .../parts/search/browser/searchActions.ts     | 38 +++++++++++++++++--
 .../parts/search/common/constants.ts          |  1 +
 .../electron-browser/search.contribution.ts   | 21 ++++++++--
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 29af3475e47..675c13c025d 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -11,7 +11,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { INavigator } from 'vs/base/common/iterator';
 import { SearchView } from 'vs/workbench/parts/search/browser/searchView';
-import { Match, FileMatch, FileMatchOrMatch, FolderMatch, RenderableMatch } from 'vs/workbench/parts/search/common/searchModel';
+import { Match, FileMatch, FileMatchOrMatch, FolderMatch, RenderableMatch, SearchResult } from 'vs/workbench/parts/search/common/searchModel';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
 import * as Constants from 'vs/workbench/parts/search/common/constants';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -664,7 +664,7 @@ function fileMatchToString(fileMatch: FileMatch, maxMatches: number): { text: st
 	};
 }
 
-function folderMatchToString(folderMatch: FolderMatch, maxMatches: number): string {
+function folderMatchToString(folderMatch: FolderMatch, maxMatches: number): { text: string, count: number } {
 	const fileResults: string[] = [];
 	let numMatches = 0;
 
@@ -674,7 +674,10 @@ function folderMatchToString(folderMatch: FolderMatch, maxMatches: number): stri
 		fileResults.push(fileResult.text);
 	}
 
-	return fileResults.join(lineDelimiter + lineDelimiter);
+	return {
+		text: fileResults.join(lineDelimiter + lineDelimiter),
+		count: numMatches
+	};
 }
 
 const maxClipboardMatches = 1e4;
@@ -687,10 +690,37 @@ export const copyMatchCommand: ICommandHandler = (accessor, match: RenderableMat
 	} else if (match instanceof FileMatch) {
 		text = fileMatchToString(match, maxClipboardMatches).text;
 	} else if (match instanceof FolderMatch) {
-		text = folderMatchToString(match, maxClipboardMatches);
+		text = folderMatchToString(match, maxClipboardMatches).text;
 	}
 
 	if (text) {
 		clipboardService.writeText(text);
 	}
 };
+
+function allFolderMatchesToString(folderMatches: FolderMatch[], maxMatches: number): string {
+	const folderResults: string[] = [];
+	let numMatches = 0;
+
+	for (let i = 0; i < folderMatches.length && numMatches < maxMatches; i++) {
+		const folderResult = folderMatchToString(folderMatches[i], maxMatches - numMatches);
+		if (folderResult.count) {
+			numMatches += folderResult.count;
+			folderResults.push(folderResult.text);
+		}
+	}
+
+	return folderResults.join(lineDelimiter + lineDelimiter);
+}
+
+export const copyAllCommand: ICommandHandler = (accessor) => {
+	const viewletService = accessor.get(IViewletService);
+	const panelService = accessor.get(IPanelService);
+	const clipboardService = accessor.get(IClipboardService);
+
+	const searchView = getSearchView(viewletService, panelService);
+	const root: SearchResult = searchView.getControl().getInput();
+
+	const text = allFolderMatchesToString(root.folderMatches(), maxClipboardMatches);
+	clipboardService.writeText(text);
+};
diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts
index 78eb76c2af5..b8ca4a9aa84 100644
--- a/src/vs/workbench/parts/search/common/constants.ts
+++ b/src/vs/workbench/parts/search/common/constants.ts
@@ -14,6 +14,7 @@ export const CancelActionId = 'search.action.cancel';
 export const RemoveActionId = 'search.action.remove';
 export const CopyPathCommandId = 'search.action.copyPath';
 export const CopyMatchCommandId = 'search.action.copyMatch';
+export const CopyAllCommandId = 'search.action.copyAll';
 export const ReplaceActionId = 'search.action.replace';
 export const ReplaceAllInFileActionId = 'search.action.replaceAllInFile';
 export const ReplaceAllInFolderActionId = 'search.action.replaceAllInFolder';
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index 30341762f4c..9de9d564d94 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -53,7 +53,7 @@ import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/file
 import { Schemas } from 'vs/base/common/network';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand, copyMatchCommand } from 'vs/workbench/parts/search/browser/searchActions';
+import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand, copyMatchCommand, copyAllCommand } from 'vs/workbench/parts/search/browser/searchActions';
 import { VIEW_ID, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -250,7 +250,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	},
 	when: Constants.FileMatchOrMatchFocusKey,
 	group: 'search_2',
-	order: 3
+	order: 1
 });
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -271,7 +271,22 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	},
 	when: Constants.FileMatchOrFolderMatchFocusKey,
 	group: 'search_2',
-	order: 4
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.CopyAllCommandId,
+		title: nls.localize('copyAllLabel', "Copy All")
+	},
+	when: Constants.HasSearchResults,
+	group: 'search_2',
+	order: 3
+});
+
+CommandsRegistry.registerCommand({
+	id: Constants.CopyAllCommandId,
+	handler: copyAllCommand
 });
 
 CommandsRegistry.registerCommand({

From dd21d3520a3708360c264d12864173fadd71e142 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 3 Apr 2018 18:25:22 -0700
Subject: [PATCH 309/383] Add webview restoration api proposal (#46380)

Adds a proposed webiew serialization api that allows webviews to be restored automatically when vscode restarts
---
 .../markdown-language-features/package.json   |   3 +-
 .../src/features/preview.ts                   | 116 +++++++++---
 .../src/features/previewManager.ts            |  48 ++++-
 src/vs/vscode.proposed.d.ts                   |  45 ++++-
 .../api/electron-browser/mainThreadWebview.ts | 165 ++++++++++++-----
 src/vs/workbench/api/node/extHost.api.impl.ts |   3 +
 src/vs/workbench/api/node/extHost.protocol.ts |   8 +-
 src/vs/workbench/api/node/extHostWebview.ts   |  60 +++++-
 .../electron-browser/releaseNotesEditor.ts    |  69 +++----
 .../electron-browser/webview.contribution.ts  |  14 +-
 .../webview/electron-browser/webviewEditor.ts |  32 ++--
 .../webview/electron-browser/webviewInput.ts  |  74 ++++----
 .../electron-browser/webviewInputFactory.ts   |  54 ++++++
 .../electron-browser/webviewService.ts        | 175 ++++++++++++++++++
 14 files changed, 690 insertions(+), 176 deletions(-)
 create mode 100644 src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
 create mode 100644 src/vs/workbench/parts/webview/electron-browser/webviewService.ts

diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index d3fda69b63f..6fa682e351d 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -22,7 +22,8 @@
 		"onCommand:markdown.showPreviewToSide",
 		"onCommand:markdown.showLockedPreviewToSide",
 		"onCommand:markdown.showSource",
-		"onCommand:markdown.showPreviewSecuritySelector"
+		"onCommand:markdown.showPreviewSecuritySelector",
+		"onView:markdown.preview"
 	],
 	"contributes": {
 		"commands": [
diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
index 1002bcf0fc5..5a3ca7443d4 100644
--- a/extensions/markdown-language-features/src/features/preview.ts
+++ b/extensions/markdown-language-features/src/features/preview.ts
@@ -18,37 +18,85 @@ const localize = nls.loadMessageBundle();
 
 export class MarkdownPreview {
 
-	public static previewViewType = 'markdown.preview';
+	public static viewType = 'markdown.preview';
 
 	private readonly webview: vscode.Webview;
 	private throttleTimer: any;
-	private initialLine: number | undefined = undefined;
+	private line: number | undefined = undefined;
 	private readonly disposables: vscode.Disposable[] = [];
 	private firstUpdate = true;
 	private currentVersion?: { resource: vscode.Uri, version: number };
 	private forceUpdate = false;
 	private isScrolling = false;
 
-	constructor(
-		private _resource: vscode.Uri,
+	public static revive(
+		webview: vscode.Webview,
+		state: any,
+		contentProvider: MarkdownContentProvider,
+		previewConfigurations: MarkdownPreviewConfigurationManager,
+		logger: Logger,
+		topmostLineMonitor: MarkdownFileTopmostLineMonitor
+	): MarkdownPreview {
+		const resource = vscode.Uri.parse(state.resource);
+		const locked = state.locked;
+		const line = state.line;
+
+		const preview = new MarkdownPreview(
+			webview,
+			resource,
+			locked,
+			contentProvider,
+			previewConfigurations,
+			logger,
+			topmostLineMonitor);
+
+		if (!isNaN(line)) {
+			preview.line = line;
+		}
+		return preview;
+	}
+
+	public static create(
+		resource: vscode.Uri,
 		previewColumn: vscode.ViewColumn,
-		public locked: boolean,
-		private readonly contentProvider: MarkdownContentProvider,
-		private readonly previewConfigurations: MarkdownPreviewConfigurationManager,
-		private readonly logger: Logger,
+		locked: boolean,
+		contentProvider: MarkdownContentProvider,
+		previewConfigurations: MarkdownPreviewConfigurationManager,
+		logger: Logger,
 		topmostLineMonitor: MarkdownFileTopmostLineMonitor,
-		private readonly contributions: MarkdownContributions
-	) {
-		this.webview = vscode.window.createWebview(
-			MarkdownPreview.previewViewType,
-			this.getPreviewTitle(this._resource),
+		contributions: MarkdownContributions
+	): MarkdownPreview {
+		const webview = vscode.window.createWebview(
+			MarkdownPreview.viewType,
+			MarkdownPreview.getPreviewTitle(resource, locked),
 			previewColumn, {
 				enableScripts: true,
 				enableCommandUris: true,
 				enableFindWidget: true,
-				localResourceRoots: this.getLocalResourceRoots(_resource)
+				localResourceRoots: MarkdownPreview.getLocalResourceRoots(resource, contributions)
 			});
 
+		return new MarkdownPreview(
+			webview,
+			resource,
+			locked,
+			contentProvider,
+			previewConfigurations,
+			logger,
+			topmostLineMonitor);
+	}
+
+	private constructor(
+		webview: vscode.Webview,
+		private _resource: vscode.Uri,
+		public locked: boolean,
+		private readonly contentProvider: MarkdownContentProvider,
+		private readonly previewConfigurations: MarkdownPreviewConfigurationManager,
+		private readonly logger: Logger,
+		topmostLineMonitor: MarkdownFileTopmostLineMonitor
+	) {
+		this.webview = webview;
+
 		this.webview.onDidDispose(() => {
 			this.dispose();
 		}, null, this.disposables);
@@ -111,6 +159,14 @@ export class MarkdownPreview {
 		return this._resource;
 	}
 
+	public get state() {
+		return {
+			resource: this.resource.toString(),
+			locked: this.locked,
+			line: this.line
+		};
+	}
+
 	public dispose() {
 		this._onDisposeEmitter.fire();
 
@@ -124,9 +180,7 @@ export class MarkdownPreview {
 	public update(resource: vscode.Uri) {
 		const editor = vscode.window.activeTextEditor;
 		if (editor && editor.document.uri.fsPath === resource.fsPath) {
-			this.initialLine = getVisibleLine(editor);
-		} else {
-			this.initialLine = undefined;
+			this.line = getVisibleLine(editor);
 		}
 
 		// If we have changed resources, cancel any pending updates
@@ -169,6 +223,10 @@ export class MarkdownPreview {
 		return this._resource.fsPath === resource.fsPath;
 	}
 
+	public isWebviewOf(webview: vscode.Webview): boolean {
+		return this.webview === webview;
+	}
+
 	public matchesResource(
 		otherResource: vscode.Uri,
 		otherViewColumn: vscode.ViewColumn | undefined,
@@ -195,11 +253,11 @@ export class MarkdownPreview {
 
 	public toggleLock() {
 		this.locked = !this.locked;
-		this.webview.title = this.getPreviewTitle(this._resource);
+		this.webview.title = MarkdownPreview.getPreviewTitle(this._resource, this.locked);
 	}
 
-	private getPreviewTitle(resource: vscode.Uri): string {
-		return this.locked
+	private static getPreviewTitle(resource: vscode.Uri, locked: boolean): string {
+		return locked
 			? localize('lockedPreviewTitle', '[Preview] {0}', path.basename(resource.fsPath))
 			: localize('previewTitle', 'Preview {0}', path.basename(resource.fsPath));
 	}
@@ -216,7 +274,7 @@ export class MarkdownPreview {
 
 		if (typeof topLine === 'number') {
 			this.logger.log('updateForView', { markdownFile: resource });
-			this.initialLine = topLine;
+			this.line = topLine;
 			this.webview.postMessage({
 				type: 'updateView',
 				line: topLine,
@@ -233,25 +291,28 @@ export class MarkdownPreview {
 
 		const document = await vscode.workspace.openTextDocument(resource);
 		if (!this.forceUpdate && this.currentVersion && this.currentVersion.resource.fsPath === resource.fsPath && this.currentVersion.version === document.version) {
-			if (this.initialLine) {
-				this.updateForView(resource, this.initialLine);
+			if (this.line) {
+				this.updateForView(resource, this.line);
 			}
 			return;
 		}
 		this.forceUpdate = false;
 
 		this.currentVersion = { resource, version: document.version };
-		this.contentProvider.provideTextDocumentContent(document, this.previewConfigurations, this.initialLine)
+		this.contentProvider.provideTextDocumentContent(document, this.previewConfigurations, this.line)
 			.then(content => {
 				if (this._resource === resource) {
-					this.webview.title = this.getPreviewTitle(this._resource);
+					this.webview.title = MarkdownPreview.getPreviewTitle(this._resource, this.locked);
 					this.webview.html = content;
 				}
 			});
 	}
 
-	private getLocalResourceRoots(resource: vscode.Uri): vscode.Uri[] {
-		const baseRoots = this.contributions.previewResourceRoots;
+	private static getLocalResourceRoots(
+		resource: vscode.Uri,
+		contributions: MarkdownContributions
+	): vscode.Uri[] {
+		const baseRoots = contributions.previewResourceRoots;
 
 		const folder = vscode.workspace.getWorkspaceFolder(resource);
 		if (folder) {
@@ -266,6 +327,7 @@ export class MarkdownPreview {
 	}
 
 	private onDidScrollPreview(line: number) {
+		this.line = line;
 		for (const editor of vscode.window.visibleTextEditors) {
 			if (!this.isPreviewOf(editor.document.uri)) {
 				continue;
diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts
index 61fee517b43..d9a2752edd3 100644
--- a/extensions/markdown-language-features/src/features/previewManager.ts
+++ b/extensions/markdown-language-features/src/features/previewManager.ts
@@ -14,7 +14,7 @@ import { isMarkdownFile } from '../util/file';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
 import { MarkdownContributions } from '../markdownExtensions';
 
-export class MarkdownPreviewManager {
+export class MarkdownPreviewManager implements vscode.WebviewSerializer {
 	private static readonly markdownPreviewActiveContextKey = 'markdownPreviewFocus';
 
 	private readonly topmostLineMonitor = new MarkdownFileTopmostLineMonitor();
@@ -29,15 +29,14 @@ export class MarkdownPreviewManager {
 		private readonly contributions: MarkdownContributions
 	) {
 		vscode.window.onDidChangeActiveTextEditor(editor => {
-			if (editor) {
-				if (isMarkdownFile(editor.document)) {
-					for (const preview of this.previews.filter(preview => !preview.locked)) {
-						preview.update(editor.document.uri);
-					}
+			if (editor && isMarkdownFile(editor.document)) {
+				for (const preview of this.previews.filter(preview => !preview.locked)) {
+					preview.update(editor.document.uri);
 				}
 			}
 		}, null, this.disposables);
 
+		this.disposables.push(vscode.window.registerWebviewSerializer(MarkdownPreview.viewType, this));
 	}
 
 	public dispose(): void {
@@ -66,7 +65,6 @@ export class MarkdownPreviewManager {
 			preview.reveal(previewSettings.previewColumn);
 		} else {
 			preview = this.createNewPreview(resource, previewSettings);
-			this.previews.push(preview);
 		}
 
 		preview.update(resource);
@@ -90,6 +88,30 @@ export class MarkdownPreviewManager {
 		}
 	}
 
+	public async deserializeWebview(
+		webview: vscode.Webview,
+		state: any
+	): Promise<boolean> {
+		const preview = MarkdownPreview.revive(
+			webview,
+			state,
+			this.contentProvider,
+			this.previewConfigurations,
+			this.logger,
+			this.topmostLineMonitor);
+
+		this.registerPreview(preview);
+		preview.refresh();
+		return true;
+	}
+
+	public async serializeWebview(
+		webview: vscode.Webview,
+	): Promise<any> {
+		const preview = this.previews.find(preview => preview.isWebviewOf(webview));
+		return preview ? preview.state : undefined;
+	}
+
 	private getExistingPreview(
 		resource: vscode.Uri,
 		previewSettings: PreviewSettings
@@ -101,8 +123,8 @@ export class MarkdownPreviewManager {
 	private createNewPreview(
 		resource: vscode.Uri,
 		previewSettings: PreviewSettings
-	) {
-		const preview = new MarkdownPreview(
+	): MarkdownPreview {
+		const preview = MarkdownPreview.create(
 			resource,
 			previewSettings.previewColumn,
 			previewSettings.locked,
@@ -112,6 +134,14 @@ export class MarkdownPreviewManager {
 			this.topmostLineMonitor,
 			this.contributions);
 
+		return this.registerPreview(preview);
+	}
+
+	private registerPreview(
+		preview: MarkdownPreview
+	): MarkdownPreview {
+		this.previews.push(preview);
+
 		preview.onDispose(() => {
 			const existing = this.previews.indexOf(preview!);
 			if (existing >= 0) {
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 5d0f2e25d86..33c125d8467 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -568,7 +568,7 @@ declare module 'vscode' {
 	 */
 	export interface Webview {
 		/**
-		 * The type of the webview, such as `'markdownw.preview'`
+		 * The type of the webview, such as `'markdown.preview'`
 		 */
 		readonly viewType: string;
 
@@ -636,16 +636,57 @@ declare module 'vscode' {
 		dispose(): any;
 	}
 
+	/**
+	 * Save and restore webviews that have been persisted when vscode shuts down.
+	 */
+	interface WebviewSerializer {
+		/**
+		 * Save a webview's `state`.
+		 *
+		 * Called before shutdown. Webview may or may not be visible.
+		 *
+		 * @param webview Webview to serialize.
+		 *
+		 * @returns JSON serializable state blob.
+		 */
+		serializeWebview(webview: Webview): Thenable<any>;
+
+		/**
+		 * Restore a webview from its `state`.
+		 *
+		 * Called when a serialized webview first becomes active.
+		 *
+		 * @param webview Webview to restore. The serializer should take ownership of this webview.
+		 * @param state Persisted state.
+		 *
+		 * @return Was deserialization successful?
+		 */
+		deserializeWebview(webview: Webview, state: any): Thenable<boolean>;
+	}
+
 	namespace window {
 		/**
 		 * Create and show a new webview.
 		 *
-		 * @param viewType Identifier the type of the webview.
+		 * @param viewType Identifies the type of the webview.
 		 * @param title Title of the webview.
 		 * @param column Editor column to show the new webview in.
 		 * @param options Content settings for the webview.
 		 */
 		export function createWebview(viewType: string, title: string, column: ViewColumn, options: WebviewOptions): Webview;
+
+		/**
+		 * Registers a webview serializer.
+		 *
+		 * Extensions that support reviving should have an `"onView:viewType"` activation method and
+		 * make sure that `registerWebviewSerializer` is called during activation.
+		 *
+		 * Only a single serializer may be registered at a time for a given `viewType`.
+		 *
+		 * @param viewType Type of the webview that can be serialized.
+		 * @param reviver Webview serializer.
+		 */
+		export function registerWebviewSerializer(viewType: string, reviver: WebviewSerializer): Disposable;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index aba0f0c1621..323f9e9db0e 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -2,44 +2,58 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as map from 'vs/base/common/map';
-import { MainThreadWebviewsShape, MainContext, IExtHostContext, ExtHostContext, ExtHostWebviewsShape, WebviewHandle } from 'vs/workbench/api/node/extHost.protocol';
-import { dispose, Disposable } from 'vs/base/common/lifecycle';
-import { extHostNamedCustomer } from './extHostCustomers';
-import { Position } from 'vs/platform/editor/common/editor';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import * as vscode from 'vscode';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import URI from 'vs/base/common/uri';
-import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { Position } from 'vs/platform/editor/common/editor';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewHandle } from 'vs/workbench/api/node/extHost.protocol';
 import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor';
-
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
+import { IWebviewService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewService';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { extHostNamedCustomer } from './extHostCustomers';
 
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
-export class MainThreadWebviews implements MainThreadWebviewsShape {
+export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviver {
+
+	private static readonly viewType = 'mainThreadWebview';
+
 	private static readonly standardSupportedLinkSchemes = ['http', 'https', 'mailto'];
 
-	private _toDispose: Disposable[] = [];
+	private static revivalPool = 0;
+
+	private _toDispose: IDisposable[] = [];
 
 	private readonly _proxy: ExtHostWebviewsShape;
-	private readonly _webviews = new Map<WebviewHandle, WebviewInput>();
+	private readonly _webviews = new Map<WebviewHandle, WebviewEditorInput>();
+	private readonly _revivers = new Set<string>();
 
-	private _activeWebview: WebviewInput | undefined = undefined;
+	private _activeWebview: WebviewEditorInput | undefined = undefined;
 
 	constructor(
 		context: IExtHostContext,
-		@IContextKeyService _contextKeyService: IContextKeyService,
-		@IPartService private readonly _partService: IPartService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IEditorGroupService editorGroupService: IEditorGroupService,
+		@ILifecycleService lifecycleService: ILifecycleService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
-		@IEditorGroupService private readonly _editorGroupService: IEditorGroupService,
-		@IOpenerService private readonly _openerService: IOpenerService
+		@IWebviewService private readonly _webviewService: IWebviewService,
+		@IOpenerService private readonly _openerService: IOpenerService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+
 	) {
 		this._proxy = context.getProxy(ExtHostContext.ExtHostWebviews);
-		_editorGroupService.onEditorsChanged(this.onEditorsChanged, this, this._toDispose);
+		editorGroupService.onEditorsChanged(this.onEditorsChanged, this, this._toDispose);
+
+		_webviewService.registerReviver(MainThreadWebviews.viewType, this);
+		this._toDispose.push(lifecycleService.onWillShutdown(e => {
+			e.veto(this._onWillShutdown());
+		}));
 	}
 
 	dispose(): void {
@@ -51,30 +65,31 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 		viewType: string,
 		title: string,
 		column: Position,
-		options: vscode.WebviewOptions,
+		options: WebviewInputOptions,
 		extensionFolderPath: string
 	): void {
-		const webviewInput = new WebviewInput(title, options, '', {
+		const webview = this._webviewService.createWebview(MainThreadWebviews.viewType, title, column, options, extensionFolderPath, {
+			onDidClickLink: uri => this.onDidClickLink(uri, webview.options),
 			onMessage: message => this._proxy.$onMessage(handle, message),
 			onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
 			onDispose: () => {
 				this._proxy.$onDidDisposeWeview(handle).then(() => {
 					this._webviews.delete(handle);
 				});
-			},
-			onDidClickLink: (link, options) => this.onDidClickLink(link, options)
-		}, this._partService);
+			}
+		});
 
-		this._webviews.set(handle, webviewInput);
+		webview.state = {
+			viewType: viewType,
+			state: undefined
+		};
 
-		this._editorService.openEditor(webviewInput, { pinned: true }, column);
+		this._webviews.set(handle, webview);
 	}
 
 	$disposeWebview(handle: WebviewHandle): void {
 		const webview = this.getWebview(handle);
-		if (webview) {
-			this._editorService.closeEditor(webview.position, webview);
-		}
+		webview.dispose();
 	}
 
 	$setTitle(handle: WebviewHandle, value: string): void {
@@ -84,24 +99,20 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 
 	$setHtml(handle: WebviewHandle, value: string): void {
 		const webview = this.getWebview(handle);
-		webview.setHtml(value);
+		webview.html = value;
 	}
 
 	$reveal(handle: WebviewHandle, column: Position): void {
-		const webviewInput = this.getWebview(handle);
-		if (webviewInput.position === column) {
-			this._editorService.openEditor(webviewInput, { preserveFocus: true }, column);
-		} else {
-			this._editorGroupService.moveEditor(webviewInput, webviewInput.position, column, { preserveFocus: true });
-		}
+		const webview = this.getWebview(handle);
+		this._webviewService.revealWebview(webview, column);
 	}
 
 	async $sendMessage(handle: WebviewHandle, message: any): Promise<boolean> {
-		const webviewInput = this.getWebview(handle);
+		const webview = this.getWebview(handle);
 		const editors = this._editorService.getVisibleEditors()
 			.filter(e => e instanceof WebviewEditor)
 			.map(e => e as WebviewEditor)
-			.filter(e => e.input.matches(webviewInput));
+			.filter(e => e.input.matches(webview));
 
 		for (const editor of editors) {
 			editor.sendMessage(message);
@@ -110,18 +121,74 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 		return (editors.length > 0);
 	}
 
-	private getWebview(handle: number): WebviewInput {
-		const webviewInput = this._webviews.get(handle);
-		if (!webviewInput) {
+	$registerSerializer(viewType: string): void {
+		this._revivers.add(viewType);
+	}
+
+	$unregisterSerializer(viewType: string): void {
+		this._revivers.delete(viewType);
+	}
+
+	reviveWebview(webview: WebviewEditorInput) {
+		this._extensionService.activateByEvent(`onView:${webview.state.viewType}`).then(() => {
+			const handle = 'revival-' + MainThreadWebviews.revivalPool++;
+			this._webviews.set(handle, webview);
+
+			webview._events = {
+				onDidClickLink: uri => this.onDidClickLink(uri, webview.options),
+				onMessage: message => this._proxy.$onMessage(handle, message),
+				onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
+				onDispose: () => {
+					this._proxy.$onDidDisposeWeview(handle).then(() => {
+						this._webviews.delete(handle);
+					});
+				}
+			};
+
+			this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options);
+		});
+	}
+
+	canRevive(webview: WebviewEditorInput): boolean {
+		return this._revivers.has(webview.viewType) || webview.reviver !== null;
+	}
+
+	private _onWillShutdown(): TPromise<boolean> {
+		const toRevive: WebviewHandle[] = [];
+		this._webviews.forEach((view, key) => {
+			if (this.canRevive(view)) {
+				toRevive.push(key);
+			}
+		});
+
+		const reviveResponses = toRevive.map(handle =>
+			this._proxy.$serializeWebview(handle).then(state => ({ handle, state })));
+
+		return TPromise.join(reviveResponses).then(results => {
+			for (const result of results) {
+				if (result.state) {
+					const view = this._webviews.get(result.handle);
+					if (view) {
+						view.state.state = result.state;
+					}
+				}
+			}
+			return false; // Don't veto shutdown
+		});
+	}
+
+	private getWebview(handle: WebviewHandle): WebviewEditorInput {
+		const webview = this._webviews.get(handle);
+		if (!webview) {
 			throw new Error('Unknown webview handle:' + handle);
 		}
-		return webviewInput;
+		return webview;
 	}
 
 	private onEditorsChanged() {
 		const activeEditor = this._editorService.getActiveEditor();
-		let newActiveWebview: { input: WebviewInput, handle: WebviewHandle } | undefined = undefined;
-		if (activeEditor && activeEditor.input instanceof WebviewInput) {
+		let newActiveWebview: { input: WebviewEditorInput, handle: WebviewHandle } | undefined = undefined;
+		if (activeEditor && activeEditor.input instanceof WebviewEditorInput) {
 			for (const handle of map.keys(this._webviews)) {
 				const input = this._webviews.get(handle);
 				if (input.matches(activeEditor.input)) {
@@ -132,7 +199,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 		}
 
 		if (newActiveWebview) {
-			if (!this._activeWebview || !newActiveWebview.input.matches(this._activeWebview)) {
+			if (!this._activeWebview || newActiveWebview.input !== this._activeWebview) {
 				this._proxy.$onDidChangeActiveWeview(newActiveWebview.handle);
 				this._activeWebview = newActiveWebview.input;
 			}
@@ -144,7 +211,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 		}
 	}
 
-	private onDidClickLink(link: URI, options: vscode.WebviewOptions): void {
+	private onDidClickLink(link: URI, options: WebviewInputOptions): void {
 		if (!link) {
 			return;
 		}
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index de10ae5c3cf..6757325af76 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -418,6 +418,9 @@ export function createApiFactory(
 			}),
 			createWebview: proposedApiFunction(extension, (viewType: string, title: string, column: vscode.ViewColumn, options: vscode.WebviewOptions) => {
 				return extHostWebviews.createWebview(viewType, title, column, options, extension.extensionFolderPath);
+			}),
+			registerWebviewSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewSerializer) => {
+				return extHostWebviews.registerWebviewSerializer(viewType, serializer);
 			})
 		};
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index fe1dfcdb6ed..2a53c50b8ec 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -347,7 +347,7 @@ export interface MainThreadTelemetryShape extends IDisposable {
 	$publicLog(eventName: string, data?: any): void;
 }
 
-export type WebviewHandle = number;
+export type WebviewHandle = string;
 
 export interface MainThreadWebviewsShape extends IDisposable {
 	$createWebview(handle: WebviewHandle, viewType: string, title: string, column: EditorPosition, options: vscode.WebviewOptions, extensionFolderPath: string): void;
@@ -356,12 +356,18 @@ export interface MainThreadWebviewsShape extends IDisposable {
 	$setTitle(handle: WebviewHandle, value: string): void;
 	$setHtml(handle: WebviewHandle, value: string): void;
 	$sendMessage(handle: WebviewHandle, value: any): Thenable<boolean>;
+
+	$registerSerializer(viewType: string): void;
+	$unregisterSerializer(viewType: string): void;
 }
+
 export interface ExtHostWebviewsShape {
 	$onMessage(handle: WebviewHandle, message: any): void;
 	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void;
 	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void>;
 	$onDidChangePosition(handle: WebviewHandle, newPosition: EditorPosition): void;
+	$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): void;
+	$serializeWebview(webviewHandle: WebviewHandle): Thenable<any>;
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 27f69d0ec1d..5e3a1b38126 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -9,6 +9,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import { Position } from 'vs/platform/editor/common/editor';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Disposable } from './extHostTypes';
 
 export class ExtHostWebview implements vscode.Webview {
 
@@ -19,6 +20,7 @@ export class ExtHostWebview implements vscode.Webview {
 	private _isDisposed: boolean = false;
 	private _viewColumn: vscode.ViewColumn;
 	private _active: boolean;
+	private _state: any;
 
 	public readonly onMessageEmitter = new Emitter<any>();
 	public readonly onDidReceiveMessage: Event<any> = this.onMessageEmitter.event;
@@ -85,6 +87,11 @@ export class ExtHostWebview implements vscode.Webview {
 		}
 	}
 
+	get state(): any {
+		this.assertNotDisposed();
+		return this._state;
+	}
+
 	get options(): vscode.WebviewOptions {
 		this.assertNotDisposed();
 		return this._options;
@@ -128,11 +135,12 @@ export class ExtHostWebview implements vscode.Webview {
 }
 
 export class ExtHostWebviews implements ExtHostWebviewsShape {
-	private static handlePool = 1;
+	private static webviewHandlePool = 1;
 
 	private readonly _proxy: MainThreadWebviewsShape;
 
 	private readonly _webviews = new Map<WebviewHandle, ExtHostWebview>();
+	private readonly _serializers = new Map<string, vscode.WebviewSerializer>();
 
 	private _activeWebview: ExtHostWebview | undefined;
 
@@ -149,7 +157,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		options: vscode.WebviewOptions,
 		extensionFolderPath: string
 	): vscode.Webview {
-		const handle = ExtHostWebviews.handlePool++;
+		const handle = ExtHostWebviews.webviewHandlePool++ + '';
 		this._proxy.$createWebview(handle, viewType, title, typeConverters.fromViewColumn(viewColumn), options, extensionFolderPath);
 
 		const webview = new ExtHostWebview(handle, this._proxy, viewType, viewColumn, options);
@@ -157,6 +165,23 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		return webview;
 	}
 
+	registerWebviewSerializer(
+		viewType: string,
+		serializer: vscode.WebviewSerializer
+	): vscode.Disposable {
+		if (this._serializers.has(viewType)) {
+			throw new Error(`Serializer for '${viewType}' already registered`);
+		}
+
+		this._serializers.set(viewType, serializer);
+		this._proxy.$registerSerializer(viewType);
+
+		return new Disposable(() => {
+			this._serializers.delete(viewType);
+			this._proxy.$unregisterSerializer(viewType);
+		});
+	}
+
 	$onMessage(handle: WebviewHandle, message: any): void {
 		const webview = this.getWebview(handle);
 		if (webview) {
@@ -206,8 +231,35 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		}
 	}
 
-	private readonly _onDidChangeActiveWebview = new Emitter<ExtHostWebview | undefined>();
-	public readonly onDidChangeActiveWebview = this._onDidChangeActiveWebview.event;
+	$deserializeWebview(
+		webviewHandle: WebviewHandle,
+		viewType: string,
+		state: any,
+		position: Position,
+		options: vscode.WebviewOptions
+	): void {
+		const serializer = this._serializers.get(viewType);
+		if (!serializer) {
+			return;
+		}
+
+		const revivedWebview = new ExtHostWebview(webviewHandle, this._proxy, viewType, typeConverters.toViewColumn(position), options);
+		this._webviews.set(webviewHandle, revivedWebview);
+		serializer.deserializeWebview(revivedWebview, state);
+	}
+
+	$serializeWebview(
+		webviewHandle: WebviewHandle
+	): Thenable<any> {
+		const webview = this.getWebview(webviewHandle);
+
+		const serialzer = this._serializers.get(webview.viewType);
+		if (!serialzer) {
+			return TPromise.as(undefined);
+		}
+
+		return serialzer.serializeWebview(webview);
+	}
 
 	private getWebview(handle: WebviewHandle) {
 		return this._webviews.get(handle);
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index bf6f7c9feca..12978917cf6 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -5,29 +5,29 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { marked } from 'vs/base/common/marked/marked';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
+import { OS } from 'vs/base/common/platform';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { asText } from 'vs/base/node/request';
 import { IMode, TokenizationRegistry } from 'vs/editor/common/modes';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IRequestService } from 'vs/platform/request/node/request';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
-import URI from 'vs/base/common/uri';
-import { asText } from 'vs/base/node/request';
+import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
+import { IModeService } from 'vs/editor/common/services/modeService';
 import * as nls from 'vs/nls';
-import { OS } from 'vs/base/common/platform';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IRequestService } from 'vs/platform/request/node/request';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
+import { IWebviewService } from 'vs/workbench/parts/webview/electron-browser/webviewService';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
+import { Position } from 'vs/platform/editor/common/editor';
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
 
 function renderBody(
 	body: string,
@@ -51,18 +51,17 @@ export class ReleaseNotesManager {
 
 	private _releaseNotesCache: { [version: string]: TPromise<string>; } = Object.create(null);
 
-	private _currentReleaseNotes: WebviewInput | undefined = undefined;
+	private _currentReleaseNotes: WebviewEditorInput | undefined = undefined;
 
 	public constructor(
-		@IEditorGroupService private readonly _editorGroupService: IEditorGroupService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IModeService private readonly _modeService: IModeService,
 		@IOpenerService private readonly _openerService: IOpenerService,
-		@IPartService private readonly _partService: IPartService,
 		@IRequestService private readonly _requestService: IRequestService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
+		@IWebviewService private readonly _webviewService: IWebviewService,
 	) { }
 
 	public async show(
@@ -73,21 +72,23 @@ export class ReleaseNotesManager {
 		const html = await this.renderBody(releaseNoteText);
 		const title = nls.localize('releaseNotesInputName', "Release Notes: {0}", version);
 
+		const activeEditor = this._editorService.getActiveEditor();
 		if (this._currentReleaseNotes) {
 			this._currentReleaseNotes.setName(title);
-			this._currentReleaseNotes.setHtml(html);
-			const activeEditor = this._editorService.getActiveEditor();
-			if (activeEditor && activeEditor.position !== this._currentReleaseNotes.position) {
-				this._editorGroupService.moveEditor(this._currentReleaseNotes, this._currentReleaseNotes.position, activeEditor.position, { preserveFocus: true });
-			} else {
-				this._editorService.openEditor(this._currentReleaseNotes, { preserveFocus: true });
-			}
+			this._currentReleaseNotes.html = html;
+			this._webviewService.revealWebview(this._currentReleaseNotes, activeEditor ? activeEditor.position : undefined);
 		} else {
-			this._currentReleaseNotes = new WebviewInput(title, { tryRestoreScrollPosition: true, enableFindWidget: true }, html, {
-				onDidClickLink: uri => this.onDidClickLink(uri),
-				onDispose: () => { this._currentReleaseNotes = undefined; }
-			}, this._partService);
-			await this._editorService.openEditor(this._currentReleaseNotes, { pinned: true });
+			this._currentReleaseNotes = this._webviewService.createWebview(
+				'releaseNotes',
+				title,
+				activeEditor ? activeEditor.position : Position.ONE,
+				{ tryRestoreScrollPosition: true, enableFindWidget: true },
+				undefined, {
+					onDidClickLink: uri => this.onDidClickLink(uri),
+					onDispose: () => { this._currentReleaseNotes = undefined; }
+				});
+
+			this._currentReleaseNotes.html = html;
 		}
 
 		return true;
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
index 4203fa20dff..2b98fd80e6d 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
@@ -7,11 +7,21 @@ import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } fro
 import { WebviewEditor } from './webviewEditor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { WebviewInput } from './webviewInput';
+import { WebviewEditorInput } from './webviewInput';
 import { localize } from 'vs/nls';
+import { IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IWebviewService, WebviewService } from './webviewService';
+import { WebviewInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewInputFactory';
 
 (Registry.as<IEditorRegistry>(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(
 	WebviewEditor,
 	WebviewEditor.ID,
 	localize('webview.editor.label', "webview editor")),
-	[new SyncDescriptor(WebviewInput)]);
\ No newline at end of file
+	[new SyncDescriptor(WebviewEditorInput)]);
+
+Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).registerEditorInputFactory(
+	WebviewInputFactory.ID,
+	WebviewInputFactory);
+
+registerSingleton(IWebviewService, WebviewService);
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index b3d963f146b..d4e8afff2b5 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -19,7 +19,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import * as DOM from 'vs/base/browser/dom';
 import { Event, Emitter } from 'vs/base/common/event';
-import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
 import URI from 'vs/base/common/uri';
 
 export class WebviewEditor extends BaseWebviewEditor {
@@ -29,10 +29,12 @@ export class WebviewEditor extends BaseWebviewEditor {
 	private editorFrame: HTMLElement;
 	private content: HTMLElement;
 	private webviewContent: HTMLElement | undefined;
-	private readonly _onDidFocusWebview: Emitter<void>;
+
 	private _webviewFocusTracker?: DOM.IFocusTracker;
 	private _webviewFocusListenerDisposable?: IDisposable;
 
+	private readonly _onDidFocusWebview = new Emitter<void>();
+
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
@@ -43,8 +45,6 @@ export class WebviewEditor extends BaseWebviewEditor {
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService
 	) {
 		super(WebviewEditor.ID, telemetryService, themeService, _contextKeyService);
-
-		this._onDidFocusWebview = new Emitter<void>();
 	}
 
 	protected createEditor(parent: Builder): void {
@@ -54,7 +54,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 	}
 
 	private doUpdateContainer() {
-		const webviewContainer = this.input && (this.input as WebviewInput).container;
+		const webviewContainer = this.input && (this.input as WebviewEditorInput).container;
 		if (webviewContainer && webviewContainer.parentElement) {
 			const frameRect = this.editorFrame.getBoundingClientRect();
 			const containerRect = webviewContainer.parentElement.getBoundingClientRect();
@@ -103,14 +103,14 @@ export class WebviewEditor extends BaseWebviewEditor {
 	}
 
 	protected setEditorVisible(visible: boolean, position?: Position): void {
-		if (this.input && this.input instanceof WebviewInput) {
+		if (this.input && this.input instanceof WebviewEditorInput) {
 			if (visible) {
 				this.input.claimWebview(this);
 			} else {
 				this.input.releaseWebview(this);
 			}
 
-			this.updateWebview(this.input as WebviewInput);
+			this.updateWebview(this.input as WebviewEditorInput);
 		}
 
 		if (this.webviewContent) {
@@ -126,7 +126,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 	}
 
 	public clearInput() {
-		if (this.input && this.input instanceof WebviewInput) {
+		if (this.input && this.input instanceof WebviewEditorInput) {
 			this.input.releaseWebview(this);
 		}
 
@@ -136,24 +136,24 @@ export class WebviewEditor extends BaseWebviewEditor {
 		super.clearInput();
 	}
 
-	async setInput(input: WebviewInput, options: EditorOptions): TPromise<void> {
+	async setInput(input: WebviewEditorInput, options: EditorOptions): TPromise<void> {
 		if (this.input && this.input.matches(input)) {
 			return undefined;
 		}
 
 		if (this.input) {
-			(this.input as WebviewInput).releaseWebview(this);
+			(this.input as WebviewEditorInput).releaseWebview(this);
 			this._webview = undefined;
 			this.webviewContent = undefined;
 		}
 
 		await super.setInput(input, options);
 
-		input.onDidChangePosition(this.position);
+		input.onBecameActive(this.position);
 		this.updateWebview(input);
 	}
 
-	private updateWebview(input: WebviewInput) {
+	private updateWebview(input: WebviewEditorInput) {
 		const webview = this.getWebview(input);
 		input.claimWebview(this);
 		webview.options = {
@@ -163,7 +163,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 			useSameOriginForRoot: false,
 			localResourceRoots: input.options.localResourceRoots || this.getDefaultLocalResourceRoots()
 		};
-		input.setHtml(input.html);
+		input.html = input.html;
 
 		if (this.webviewContent) {
 			this.webviewContent.style.visibility = 'visible';
@@ -174,13 +174,13 @@ export class WebviewEditor extends BaseWebviewEditor {
 
 	private getDefaultLocalResourceRoots(): URI[] {
 		const rootPaths = this._contextService.getWorkspace().folders.map(x => x.uri);
-		if ((this.input as WebviewInput).extensionFolderPath) {
-			rootPaths.push((this.input as WebviewInput).extensionFolderPath);
+		if ((this.input as WebviewEditorInput).extensionFolderPath) {
+			rootPaths.push((this.input as WebviewEditorInput).extensionFolderPath);
 		}
 		return rootPaths;
 	}
 
-	private getWebview(input: WebviewInput): Webview {
+	private getWebview(input: WebviewEditorInput): Webview {
 		if (this._webview) {
 			return this._webview;
 		}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
index 0d925f614b7..1bd9535aeaf 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
@@ -5,69 +5,61 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IEditorInput, IEditorModel, Position } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
-import { IEditorModel, Position, IEditorInput } from 'vs/platform/editor/common/editor';
 import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
-import * as vscode from 'vscode';
-import URI from 'vs/base/common/uri';
+import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewService';
 
-export interface WebviewEvents {
-	onMessage?(message: any): void;
-	onDidChangePosition?(newPosition: Position): void;
-	onDispose?(): void;
-	onDidClickLink?(link: URI, options: vscode.WebviewOptions): void;
-}
 
-export interface WebviewInputOptions extends vscode.WebviewOptions {
-	tryRestoreScrollPosition?: boolean;
-}
-
-export class WebviewInput extends EditorInput {
+export class WebviewEditorInput extends EditorInput {
 	private static handlePool = 0;
 
+	public static readonly typeId = 'workbench.editors.webviewInput';
+
 	private _name: string;
 	private _options: WebviewInputOptions;
-	private _html: string;
+	private _html: string = '';
 	private _currentWebviewHtml: string = '';
-	private _events: WebviewEvents | undefined;
+	public _events: WebviewEvents | undefined;
 	private _container: HTMLElement;
 	private _webview: Webview | undefined;
 	private _webviewOwner: any;
 	private _webviewDisposables: IDisposable[] = [];
 	private _position?: Position;
 	private _scrollYPercentage: number = 0;
+	private _state: any;
+
+	private _revived: boolean = false;
+
 	public readonly extensionFolderPath: URI | undefined;
 
 	constructor(
+		public readonly viewType: string,
 		name: string,
 		options: WebviewInputOptions,
-		html: string,
+		state: any,
 		events: WebviewEvents,
-		partService: IPartService,
-		extensionFolderPath?: string
+		extensionFolderPath: string | undefined,
+		public readonly reviver: WebviewReviver | undefined,
+		@IPartService private readonly _partService: IPartService,
 	) {
 		super();
 		this._name = name;
 		this._options = options;
-		this._html = html;
 		this._events = events;
+		this._state = state;
 
 		if (extensionFolderPath) {
 			this.extensionFolderPath = URI.file(extensionFolderPath);
 		}
-
-		const id = WebviewInput.handlePool++;
-		this._container = document.createElement('div');
-		this._container.id = `webview-${id}`;
-
-		partService.getContainer(Parts.EDITOR_PART).appendChild(this._container);
 	}
 
 	public getTypeId(): string {
-		return 'webview';
+		return WebviewEditorInput.typeId;
 	}
 
 	public dispose() {
@@ -119,7 +111,7 @@ export class WebviewInput extends EditorInput {
 		return this._html;
 	}
 
-	public setHtml(value: string): void {
+	public set html(value: string) {
 		if (value === this._currentWebviewHtml) {
 			return;
 		}
@@ -132,6 +124,14 @@ export class WebviewInput extends EditorInput {
 		}
 	}
 
+	public get state(): any {
+		return this._state;
+	}
+
+	public set state(value: any) {
+		this._state = value;
+	}
+
 	public get options(): WebviewInputOptions {
 		return this._options;
 	}
@@ -149,6 +149,12 @@ export class WebviewInput extends EditorInput {
 	}
 
 	public get container(): HTMLElement {
+		if (!this._container) {
+			const id = WebviewEditorInput.handlePool++;
+			this._container = document.createElement('div');
+			this._container.id = `webview-${id}`;
+			this._partService.getContainer(Parts.EDITOR_PART).appendChild(this._container);
+		}
 		return this._container;
 	}
 
@@ -215,10 +221,16 @@ export class WebviewInput extends EditorInput {
 		this._currentWebviewHtml = '';
 	}
 
-	public onDidChangePosition(position: Position) {
+	public onBecameActive(position: Position) {
+		this._position = position;
+
 		if (this._events && this._events.onDidChangePosition) {
 			this._events.onDidChangePosition(position);
 		}
-		this._position = position;
+
+		if (this.reviver && !this._revived) {
+			this._revived = true;
+			this.reviver.reviveWebview(this);
+		}
 	}
 }
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
new file mode 100644
index 00000000000..824907dca95
--- /dev/null
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IEditorInputFactory } from 'vs/workbench/common/editor';
+import { IWebviewService, WebviewInputOptions } from './webviewService';
+import { WebviewEditorInput } from './webviewInput';
+
+interface SerializedWebview {
+	readonly viewType: string;
+	readonly title: string;
+	readonly options: WebviewInputOptions;
+	readonly extensionFolderPath: string;
+	readonly state: any;
+}
+
+export class WebviewInputFactory implements IEditorInputFactory {
+
+	public static readonly ID = WebviewEditorInput.typeId;
+
+	public constructor(
+		@IWebviewService private readonly _webviewService: IWebviewService
+	) { }
+
+	public serialize(
+		input: WebviewEditorInput
+	): string {
+		// Only attempt revival if we may have a reviver
+		if (!this._webviewService.canRevive(input) && !input.reviver) {
+			return null;
+		}
+
+		const data: SerializedWebview = {
+			viewType: input.viewType,
+			title: input.getName(),
+			options: input.options,
+			extensionFolderPath: input.extensionFolderPath.fsPath,
+			state: input.state
+		};
+		return JSON.stringify(data);
+	}
+
+	public deserialize(
+		instantiationService: IInstantiationService,
+		serializedEditorInput: string
+	): WebviewEditorInput {
+		const data: SerializedWebview = JSON.parse(serializedEditorInput);
+		return this._webviewService.createRevivableWebview(data.viewType, data.title, data.state, data.options, data.extensionFolderPath);
+	}
+}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
new file mode 100644
index 00000000000..e9bead7bb42
--- /dev/null
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import URI from 'vs/base/common/uri';
+import { Position } from 'vs/platform/editor/common/editor';
+import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import * as vscode from 'vscode';
+import { WebviewEditorInput } from './webviewInput';
+
+export const IWebviewService = createDecorator<IWebviewService>('webviewService');
+
+export interface IWebviewService {
+	_serviceBrand: any;
+
+	createWebview(
+		viewType: string,
+		title: string,
+		column: Position,
+		options: WebviewInputOptions,
+		extensionFolderPath: string,
+		events: WebviewEvents
+	): WebviewEditorInput;
+
+	createRevivableWebview(
+		viewType: string,
+		title: string,
+		state: any,
+		options: WebviewInputOptions,
+		extensionFolderPath: string
+	): WebviewEditorInput;
+
+	revealWebview(
+		webview: WebviewEditorInput,
+		column: Position | undefined
+	): void;
+
+	registerReviver(
+		viewType: string,
+		reviver: WebviewReviver
+	): IDisposable;
+
+	canRevive(
+		input: WebviewEditorInput
+	): boolean;
+}
+
+export interface WebviewReviver {
+	canRevive(
+		webview: WebviewEditorInput
+	): boolean;
+
+	reviveWebview(
+		webview: WebviewEditorInput
+	): void;
+}
+
+export interface WebviewEvents {
+	onMessage?(message: any): void;
+	onDidChangePosition?(newPosition: Position): void;
+	onDispose?(): void;
+	onDidClickLink?(link: URI, options: vscode.WebviewOptions): void;
+}
+
+export interface WebviewInputOptions extends vscode.WebviewOptions {
+	tryRestoreScrollPosition?: boolean;
+}
+
+export class WebviewService implements IWebviewService {
+	_serviceBrand: any;
+
+	private readonly _revivers = new Map<string, WebviewReviver>();
+	private readonly _needingRevival = new Map<string, WebviewEditorInput[]>();
+
+	constructor(
+		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IEditorGroupService private readonly _editorGroupService: IEditorGroupService,
+	) { }
+
+	createWebview(
+		viewType: string,
+		title: string,
+		column: Position,
+		options: vscode.WebviewOptions,
+		extensionFolderPath: string,
+		events: WebviewEvents
+	): WebviewEditorInput {
+		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, title, options, {}, events, extensionFolderPath, undefined);
+		this._editorService.openEditor(webviewInput, { pinned: true }, column);
+		return webviewInput;
+	}
+
+	revealWebview(
+		webview: WebviewEditorInput,
+		column: Position | undefined
+	): void {
+		if (typeof column === 'undefined') {
+			column = webview.position;
+		}
+
+		if (webview.position === column) {
+			this._editorService.openEditor(webview, { preserveFocus: true }, column);
+		} else {
+			this._editorGroupService.moveEditor(webview, webview.position, column, { preserveFocus: true });
+		}
+	}
+
+	createRevivableWebview(
+		viewType: string,
+		title: string,
+		state: any,
+		options: WebviewInputOptions,
+		extensionFolderPath: string
+	): WebviewEditorInput {
+		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, title, options, state, {}, extensionFolderPath, {
+			canRevive: (webview) => {
+				return true;
+			},
+			reviveWebview: (webview) => {
+				if (!this._needingRevival.has(viewType)) {
+					this._needingRevival.set(viewType, []);
+				}
+				this._needingRevival.get(viewType).push(webviewInput);
+				this.tryRevive(viewType);
+			}
+		});
+
+		return webviewInput;
+	}
+
+	registerReviver(
+		viewType: string,
+		reviver: WebviewReviver
+	): IDisposable {
+		if (this._revivers.has(viewType)) {
+			throw new Error(`Reveriver for 'viewType' already registered`);
+		}
+
+		this._revivers.set(viewType, reviver);
+		this.tryRevive(viewType);
+
+		return toDisposable(() => {
+			this._revivers.delete(viewType);
+		});
+	}
+
+	canRevive(
+		webview: WebviewEditorInput
+	): boolean {
+		const viewType = webview.viewType;
+		return this._revivers.has(viewType) && this._revivers.get(viewType).canRevive(webview);
+	}
+
+	tryRevive(
+		viewType: string
+	) {
+		const reviver = this._revivers.get(viewType);
+		if (!reviver) {
+			return;
+		}
+
+		const toRevive = this._needingRevival.get(viewType);
+		if (!toRevive) {
+			return;
+		}
+
+		for (const webview of toRevive) {
+			reviver.reviveWebview(webview);
+		}
+	}
+}
\ No newline at end of file

From 62bc9143c14d10e3462de110dc26aa32755b95e9 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 3 Apr 2018 19:19:42 -0700
Subject: [PATCH 310/383] Bump node2, fix Microsoft/vscode-internalbacklog#181

---
 build/builtInExtensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 4bd1d55b0b7..696a6d05383 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -6,7 +6,7 @@
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.22.6",
+		"version": "1.22.8",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
 ]

From 17ed2280597e68fefa00b43c8d28d0442891ea22 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 4 Apr 2018 07:35:27 +0200
Subject: [PATCH 311/383] debt - make notification#prompt() nicer to use

---
 .../standalone/browser/simpleServices.ts      |   6 +-
 .../integrity/node/integrityServiceImpl.ts    |  36 ++-
 .../common/abstractKeybindingService.test.ts  |   6 +-
 .../notification/common/notification.ts       |  37 +--
 src/vs/workbench/common/notifications.ts      |   2 +-
 .../extensions/browser/extensionsActions.ts   |  65 +++--
 .../electron-browser/extensionTipsService.ts  | 271 ++++++++++--------
 .../extensions.contribution.ts                |   3 +-
 .../electron-browser/extensionsActions.ts     |  32 ++-
 .../electron-browser/extensionsUtils.ts       |  93 +++---
 .../electron-browser/extensionsViewlet.ts     |  15 +-
 .../node/extensionsWorkbenchService.ts        |  19 +-
 .../extensionsTipsService.test.ts             |   6 +-
 .../files/electron-browser/fileActions.ts     |  11 +-
 .../browser/localizations.contribution.ts     |  22 +-
 .../languageSurveys.contribution.ts           |  32 ++-
 .../electron-browser/nps.contribution.ts      |  31 +-
 .../electron-browser/task.contribution.ts     |  49 ++--
 .../electron-browser/terminalConfigHelper.ts  |  22 +-
 .../electron-browser/terminalService.ts       |  27 +-
 ...supportedWorkspaceSettings.contribution.ts |  25 +-
 .../parts/update/electron-browser/update.ts   | 152 ++++++----
 .../electron-browser/telemetryOptOut.ts       |  11 +-
 .../page/electron-browser/welcomePage.ts      |  21 +-
 .../node/configurationEditingService.ts       |  68 ++---
 .../electron-browser/extensionHost.ts         |  11 +-
 .../electron-browser/extensionService.ts      |  33 ++-
 .../files/electron-browser/fileService.ts     |  50 ++--
 .../common/notificationService.ts             |  74 ++---
 .../workspace/node/workspaceEditingService.ts |  28 +-
 .../api/extHostMessagerService.test.ts        |   8 +-
 .../workbench/test/workbenchTestServices.ts   |   6 +-
 32 files changed, 672 insertions(+), 600 deletions(-)

diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
index 3a45cc198a9..a09429f1137 100644
--- a/src/vs/editor/standalone/browser/simpleServices.ts
+++ b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -38,7 +38,7 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
 import { OS } from 'vs/base/common/platform';
 import { IRange } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
-import { INotificationService, INotification, INotificationHandle, NoOpNotification, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService, INotification, INotificationHandle, NoOpNotification, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { IConfirmation, IConfirmationResult, IDialogService, IDialogOptions } from 'vs/platform/dialogs/common/dialogs';
 import { IPosition, Position as Pos } from 'vs/editor/common/core/position';
 
@@ -297,8 +297,8 @@ export class SimpleNotificationService implements INotificationService {
 		return SimpleNotificationService.NO_OP;
 	}
 
-	public prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
-		return TPromise.as(0);
+	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+		return SimpleNotificationService.NO_OP;
 	}
 }
 
diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts
index 34fd1e44a4f..5a45065e013 100644
--- a/src/vs/platform/integrity/node/integrityServiceImpl.ts
+++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts
@@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface IStorageData {
 	dontShowPrompt: boolean;
@@ -82,26 +82,24 @@ export class IntegrityServiceImpl implements IIntegrityService {
 	private _prompt(): void {
 		const storedData = this._storage.get();
 		if (storedData && storedData.dontShowPrompt && storedData.commit === product.commit) {
-			// Do not prompt
-			return;
+			return; // Do not prompt
 		}
 
-		const choices: PromptOption[] = [nls.localize('integrity.moreInformation', "More Information"), { label: nls.localize('integrity.dontShowAgain', "Don't Show Again") }];
-
-		this.notificationService.prompt(Severity.Warning, nls.localize('integrity.prompt', "Your {0} installation appears to be corrupt. Please reinstall.", product.nameShort), choices).then(choice => {
-			switch (choice) {
-				case 0 /* More Information */:
-					const uri = URI.parse(product.checksumFailMoreInfoUrl);
-					window.open(uri.toString(true));
-					break;
-				case 1 /* Do not show again */:
-					this._storage.set({
-						dontShowPrompt: true,
-						commit: product.commit
-					});
-					break;
-			}
-		});
+		this.notificationService.prompt(
+			Severity.Warning,
+			nls.localize('integrity.prompt', "Your {0} installation appears to be corrupt. Please reinstall.", product.nameShort),
+			[
+				{
+					label: nls.localize('integrity.moreInformation', "More Information"),
+					run: () => window.open(URI.parse(product.checksumFailMoreInfoUrl).toString(true))
+				},
+				{
+					label: nls.localize('integrity.dontShowAgain', "Don't Show Again"),
+					isSecondary: true,
+					run: () => this._storage.set({ dontShowPrompt: true, commit: product.commit })
+				}
+			]
+		);
 	}
 
 	public isPure(): Thenable<IntegrityTestResult> {
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index 6c00827eac5..44ea5de8c5d 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -19,7 +19,7 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
 import { OS } from 'vs/base/common/platform';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { INotificationService, NoOpNotification, INotification } from 'vs/platform/notification/common/notification';
+import { INotificationService, NoOpNotification, INotification, IPromptChoice } from 'vs/platform/notification/common/notification';
 
 function createContext(ctx: any) {
 	return {
@@ -139,8 +139,8 @@ suite('AbstractKeybindingService', () => {
 					showMessageCalls.push({ sev: Severity.Error, message });
 					return new NoOpNotification();
 				},
-				prompt: () => {
-					return TPromise.as(0);
+				prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void) {
+					throw new Error('not implemented');
 				}
 			};
 
diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
index 62b7e6751cd..7f1c3d4c507 100644
--- a/src/vs/platform/notification/common/notification.ts
+++ b/src/vs/platform/notification/common/notification.ts
@@ -10,7 +10,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IAction } from 'vs/base/common/actions';
 import { Event, Emitter } from 'vs/base/common/event';
-import { TPromise } from 'vs/base/common/winjs.base';
 
 export import Severity = BaseSeverity;
 
@@ -121,26 +120,30 @@ export interface INotificationHandle extends IDisposable {
 	updateActions(actions?: INotificationActions): void;
 }
 
+export interface IPromptChoice {
 
-/**
- * Primary choices show up as buttons in the notification below the message.
- */
-export type PrimaryPromptChoice = string;
-
-/**
- * Secondary choices show up under the gear icon in the header of the notification.
- */
-export interface SecondaryPromptChoice {
+	/**
+	 * Label to show for the choice to the user.
+	 */
 	label: string;
 
 	/**
-	 * Wether to keep the notification open after the secondary choice was selected
+	 * Primary choices show up as buttons in the notification below the message.
+	 * Secondary choices show up under the gear icon in the header of the notification.
+	 */
+	isSecondary?: boolean;
+
+	/**
+	 * Wether to keep the notification open after the choice was selected
 	 * by the user. By default, will close the notification upon click.
 	 */
 	keepOpen?: boolean;
-}
 
-export type PromptOption = PrimaryPromptChoice | SecondaryPromptChoice;
+	/**
+	 * Triggered when the user selects the choice.
+	 */
+	run: () => void;
+}
 
 /**
  * A service to bring up notifications and non-modal prompts.
@@ -185,10 +188,12 @@ export interface INotificationService {
 	 * Shows a prompt in the notification area with the provided choices. The prompt
 	 * is non-modal. If you want to show a modal dialog instead, use `IDialogService`.
 	 *
-	 * @returns a promise that will resolve to the index of the choice that was picked.
-	 * The promise can be cancelled to hide the notification prompt.
+	 * @param onCancel will be called if the user closed the notification without picking
+	 * any of the provided choices.
+	 *
+	 * @returns a handle on the notification to e.g. hide it or update message, buttons, etc.
 	 */
-	prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number>;
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle;
 }
 
 export class NoOpNotification implements INotificationHandle {
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index 41b614cd182..88fd2bc2e44 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -582,7 +582,7 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 
 		for (let i = 0; i < primaryActions.length; i++) {
-			if (primaryActions[i].id !== otherPrimaryActions[i].id) {
+			if ((primaryActions[i].id + primaryActions[i].label) !== (otherPrimaryActions[i].id + otherPrimaryActions[i].label)) {
 				return false;
 			}
 		}
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index afc0d173ab5..df3e59bcee6 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -10,7 +10,7 @@ import { IAction, Action } from 'vs/base/common/actions';
 import { Throttler } from 'vs/base/common/async';
 import * as DOM from 'vs/base/browser/dom';
 import * as paths from 'vs/base/common/paths';
-import { Event, once } from 'vs/base/common/event';
+import { Event } from 'vs/base/common/event';
 import * as json from 'vs/base/common/json';
 import { ActionItem, IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -49,21 +49,23 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 
 const promptDownloadManually = (extension: IExtension, message: string, instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService) => {
-	notificationService.prompt(Severity.Error, message, [localize('download', "Download Manually")]).done(choice => {
-		if (choice === 0) {
-			openerService.open(URI.parse(extension.downloadUrl)).then(() => {
-				const action = instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
-				const handle = notificationService.notify({
-					severity: Severity.Info,
-					message: localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', extension.id),
-					actions: {
-						primary: [action]
+	notificationService.prompt(Severity.Error, message, [{
+		label: localize('download', "Download Manually"),
+		run: () => openerService.open(URI.parse(extension.downloadUrl)).then(() => {
+			notificationService.prompt(
+				Severity.Info,
+				localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', extension.id),
+				[{
+					label: InstallVSIXAction.LABEL,
+					run: () => {
+						const action = instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
+						action.run();
+						action.dispose();
 					}
-				});
-				once(handle.onDidDispose)(() => action.dispose());
-			});
-		}
-	});
+				}]
+			);
+		})
+	}]);
 };
 
 export class InstallAction extends Action {
@@ -1882,13 +1884,13 @@ export class InstallVSIXAction extends Action {
 		label = InstallVSIXAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowsService: IWindowService
+		@IWindowService private windowService: IWindowService
 	) {
 		super(id, label, 'extension-action install-vsix', true);
 	}
 
 	run(): TPromise<any> {
-		return this.windowsService.showOpenDialog({
+		return this.windowService.showOpenDialog({
 			title: localize('installFromVSIX', "Install from VSIX"),
 			filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
 			properties: ['openFile'],
@@ -1899,19 +1901,19 @@ export class InstallVSIXAction extends Action {
 			}
 
 			return TPromise.join(result.map(vsix => this.extensionsWorkbenchService.install(vsix))).then(() => {
-				return this.notificationService.prompt(Severity.Info, localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."), [localize('InstallVSIXAction.reloadNow', "Reload Now")]).then(choice => {
-					if (choice === 0) {
-						return this.windowsService.reloadWindow();
-					}
-
-					return TPromise.as(undefined);
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."),
+					[{
+						label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			});
 		});
 	}
 }
 
-
 export class ReinstallAction extends Action {
 
 	static readonly ID = 'workbench.extensions.action.reinstall';
@@ -1955,11 +1957,14 @@ export class ReinstallAction extends Action {
 	private reinstallExtension(extension: IExtension): TPromise<void> {
 		return this.extensionsWorkbenchService.reinstall(extension)
 			.then(() => {
-				this.notificationService.prompt(Severity.Info, localize('ReinstallAction.success', "Successfully reinstalled the extension."), [localize('ReinstallAction.reloadNow', "Reload Now")]).done(choice => {
-					if (choice === 0) {
-						this.windowService.reloadWindow();
-					}
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('ReinstallAction.success', "Successfully reinstalled the extension."),
+					[{
+						label: localize('ReinstallAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			}, error => this.notificationService.error(error));
 	}
 }
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index 0b7b540ca90..93215f58bfd 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -36,7 +36,7 @@ import { asJson } from 'vs/base/node/request';
 import { isNumber } from 'vs/base/common/types';
 import { language, LANGUAGE_DEFAULT } from 'vs/base/common/platform';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface IExtensionsContent {
 	recommendations: string[];
@@ -160,15 +160,13 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				if (!pager || !pager.firstPage || !pager.firstPage.length) {
 					return;
 				}
-				const message = localize('showLanguagePackExtensions', "The Marketplace has extensions that can help localizing VS Code to '{0}' locale", language);
-				const options: PromptOption[] = [
-					searchMarketplace,
-					{ label: choiceNever }
-				];
 
-				this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-					switch (choice) {
-						case 0 /* Search Marketplace */:
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('showLanguagePackExtensions', "The Marketplace has extensions that can help localizing VS Code to '{0}' locale", language),
+					[{
+						label: searchMarketplace,
+						run: () => {
 							/* __GDPR__
 								"languagePackSuggestion:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -182,8 +180,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 									viewlet.search(`tag:lp-${language}`);
 									viewlet.focus();
 								});
-							break;
-						case 1 /* Never show again */:
+						}
+					},
+					{
+						label: choiceNever,
+						isSecondary: true,
+						run: () => {
 							languagePackSuggestionIgnoreList.push(language);
 							this.storageService.store(
 								'extensionsAssistant/languagePackSuggestionIgnore',
@@ -197,17 +199,18 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('languagePackSuggestion:popup', { userReaction: 'neverShowAgain', language });
-							break;
-					}
-				}, () => {
-					/* __GDPR__
-						"languagePackSuggestion:popup" : {
-							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"language": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 						}
-					*/
-					this.telemetryService.publicLog('languagePackSuggestion:popup', { userReaction: 'cancelled', language });
-				});
+					}],
+					() => {
+						/* __GDPR__
+							"languagePackSuggestion:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"language": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							}
+						*/
+						this.telemetryService.publicLog('languagePackSuggestion:popup', { userReaction: 'cancelled', language });
+					}
+				);
 			});
 		});
 	}
@@ -487,26 +490,25 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					message = localize('reallyRecommendedExtensionPack', "The '{0}' extension pack is recommended for this file type.", name);
 				}
 
-				const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
-				const installAction = this.instantiationService.createInstance(InstallRecommendedExtensionAction, id);
-				const options: PromptOption[] = [
-					localize('install', 'Install'),
-					recommendationsAction.label,
-					{ label: choiceNever }
-				];
-
-				this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-					switch (choice) {
-						case 0 /* Install */:
+				this.notificationService.prompt(Severity.Info, message,
+					[{
+						label: localize('install', 'Install'),
+						run: () => {
 							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-								}
+							"extensionRecommendations:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'install', extensionId: name });
-							return installAction.run();
-						case 1 /* Show Recommendations */:
+
+							const installAction = this.instantiationService.createInstance(InstallRecommendedExtensionAction, id);
+							installAction.run();
+							installAction.dispose();
+						}
+					}, {
+						label: localize('showRecommendations', "Show Recommendations"),
+						run: () => {
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -514,8 +516,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'show', extensionId: name });
-							return recommendationsAction.run();
-						case 2 /* Never show again */:
+
+							const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
+							recommendationsAction.run();
+							recommendationsAction.dispose();
+						}
+					}, {
+						label: choiceNever,
+						isSecondary: true,
+						run: () => {
 							importantRecommendationsIgnoreList.push(id);
 							this.storageService.store(
 								'extensionsAssistant/importantRecommendationsIgnore',
@@ -529,17 +538,19 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
-							return this.ignoreExtensionRecommendations();
-					}
-				}, () => {
-					/* __GDPR__
-						"extensionRecommendations:popup" : {
-							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							this.ignoreExtensionRecommendations();
 						}
-					*/
-					this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
-				});
+					}],
+					() => {
+						/* __GDPR__
+							"extensionRecommendations:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							}
+						*/
+						this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
+					}
+				);
 			});
 
 			const mimeTypesPromise = this.getMimeTypes(uri.fsPath);
@@ -568,15 +579,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 						return;
 					}
 
-					const message = localize('showLanguageExtensions', "The Marketplace has extensions that can help with '.{0}' files", fileExtension);
-					const options: PromptOption[] = [
-						searchMarketplace,
-						{ label: choiceNever }
-					];
-
-					this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-						switch (choice) {
-							case 0 /* Search Marketplace */:
+					this.notificationService.prompt(
+						Severity.Info,
+						localize('showLanguageExtensions', "The Marketplace has extensions that can help with '.{0}' files", fileExtension),
+						[{
+							label: searchMarketplace,
+							run: () => {
 								/* __GDPR__
 									"fileExtensionSuggestion:popup" : {
 										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -590,8 +598,11 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 										viewlet.search(`ext:${fileExtension}`);
 										viewlet.focus();
 									});
-								break;
-							case 1 /* Never show again */:
+							}
+						}, {
+							label: choiceNever,
+							isSecondary: true,
+							run: () => {
 								fileExtensionSuggestionIgnoreList.push(fileExtension);
 								this.storageService.store(
 									'extensionsAssistant/fileExtensionsSuggestionIgnore',
@@ -605,17 +616,18 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 									}
 								*/
 								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'neverShowAgain', fileExtension: fileExtension });
-								break;
-						}
-					}, () => {
-						/* __GDPR__
-							"fileExtensionSuggestion:popup" : {
-								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-								"fileExtension": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 							}
-						*/
-						this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'cancelled', fileExtension: fileExtension });
-					});
+						}],
+						() => {
+							/* __GDPR__
+								"fileExtensionSuggestion:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									"fileExtension": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+								}
+							*/
+							this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'cancelled', fileExtension: fileExtension });
+						}
+					);
 				});
 			});
 		});
@@ -635,73 +647,88 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					.filter(id => local.every(local => `${local.manifest.publisher.toLowerCase()}.${local.manifest.name.toLowerCase()}` !== id));
 
 				if (!recommendations.length) {
-					return;
+					return TPromise.as(void 0);
 				}
 
-				const message = localize('workspaceRecommended', "This workspace has extension recommendations.");
-				const showAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
-				const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, localize('installAll', "Install All"));
+				return new TPromise<void>(c => {
+					this.notificationService.prompt(
+						Severity.Info,
+						localize('workspaceRecommended', "This workspace has extension recommendations."),
+						[{
+							label: localize('installAll', "Install All"),
+							run: () => {
+								/* __GDPR__
+								"extensionRecommendations:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								}
+								*/
+								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'install' });
 
-				const options: PromptOption[] = [
-					installAllAction.label,
-					showAction.label,
-					{ label: choiceNever }
-				];
+								const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, localize('installAll', "Install All"));
+								installAllAction.run();
+								installAllAction.dispose();
 
-				return this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-					switch (choice) {
-						case 0 /* Install */:
+								c(void 0);
+							}
+						}, {
+							label: localize('showRecommendations', "Show Recommendations"),
+							run: () => {
+								/* __GDPR__
+									"extensionRecommendations:popup" : {
+										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+									}
+								*/
+								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
+
+								const showAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
+								showAction.run();
+								showAction.dispose();
+
+								c(void 0);
+							}
+						}, {
+							label: choiceNever,
+							isSecondary: true,
+							run: () => {
+								/* __GDPR__
+									"extensionRecommendations:popup" : {
+										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+									}
+								*/
+								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
+								this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
+
+								c(void 0);
+							}
+						}],
+						() => {
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 								}
 							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'install' });
-							return installAllAction.run();
-						case 1 /* Show Recommendations */:
-							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-								}
-							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
-							return showAction.run();
-						case 2 /* Never show again */:
-							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-								}
-							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
-							return this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
-					}
-				}, () => {
-					/* __GDPR__
-						"extensionRecommendations:popup" : {
-							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'cancelled' });
+
+							c(void 0);
 						}
-					*/
-					this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'cancelled' });
+					);
 				});
 			});
 		});
 	}
 
 	private ignoreExtensionRecommendations() {
-		const message = localize('ignoreExtensionRecommendations', "Do you want to ignore all extension recommendations?");
-		const options = [
-			localize('ignoreAll', "Yes, Ignore All"),
-			localize('no', "No")
-		];
-
-		this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-			switch (choice) {
-				case 0:	// If the user ignores the current message and selects different file type
-					return this.setIgnoreRecommendationsConfig(true);
-				case 1:
-					return this.setIgnoreRecommendationsConfig(false);
-			}
-		});
+		this.notificationService.prompt(
+			Severity.Info,
+			localize('ignoreExtensionRecommendations', "Do you want to ignore all extension recommendations?"),
+			[{
+				label: localize('ignoreAll', "Yes, Ignore All"),
+				run: () => this.setIgnoreRecommendationsConfig(true)
+			}, {
+				label: localize('no', "No"),
+				run: () => this.setIgnoreRecommendationsConfig(false)
+			}]
+		);
 	}
 
 	private _suggestBasedOnExecutables(): TPromise<any> {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
index 6cdd37b47c3..9fcd5142a61 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -34,7 +34,7 @@ import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonCo
 import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeymapExtensions, BetterMergeDisabled } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
+import { KeymapExtensions } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
 import { adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { GalleryExtensionsHandler, ExtensionsHandler } from 'vs/workbench/parts/extensions/browser/extensionsQuickOpen';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
@@ -54,7 +54,6 @@ workbenchRegistry.registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Ru
 workbenchRegistry.registerWorkbenchContribution(MaliciousExtensionChecker, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(ConfigureRecommendedExtensionsCommandsContributor, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase.Running);
-workbenchRegistry.registerWorkbenchContribution(BetterMergeDisabled, LifecyclePhase.Running);
 
 Registry.as<IOutputChannelRegistry>(OutputExtensions.OutputChannels)
 	.registerChannel(ExtensionsChannelId, ExtensionsLabel);
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
index 0b284cca2bd..06d3286942b 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
@@ -59,13 +59,13 @@ export class InstallVSIXAction extends Action {
 		label = InstallVSIXAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowsService: IWindowService
+		@IWindowService private windowService: IWindowService
 	) {
 		super(id, label, 'extension-action install-vsix', true);
 	}
 
 	run(): TPromise<any> {
-		return this.windowsService.showOpenDialog({
+		return this.windowService.showOpenDialog({
 			title: localize('installFromVSIX', "Install from VSIX"),
 			filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
 			properties: ['openFile'],
@@ -76,13 +76,14 @@ export class InstallVSIXAction extends Action {
 			}
 
 			return TPromise.join(result.map(vsix => this.extensionsWorkbenchService.install(vsix))).then(() => {
-				return this.notificationService.prompt(Severity.Info, localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."), [localize('InstallVSIXAction.reloadNow', "Reload Now")]).then(choice => {
-					if (choice === 0) {
-						return this.windowsService.reloadWindow();
-					}
-
-					return TPromise.as(undefined);
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."),
+					[{
+						label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			});
 		});
 	}
@@ -131,11 +132,14 @@ export class ReinstallAction extends Action {
 	private reinstallExtension(extension: IExtension): TPromise<void> {
 		return this.extensionsWorkbenchService.reinstall(extension)
 			.then(() => {
-				this.notificationService.prompt(Severity.Info, localize('ReinstallAction.success', "Successfully reinstalled the extension."), [localize('ReinstallAction.reloadNow', "Reload Now")]).done(choice => {
-					if (choice === 0) {
-						this.windowService.reloadWindow();
-					}
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('ReinstallAction.success', "Successfully reinstalled the extension."),
+					[{
+						label: localize('ReinstallAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			}, error => this.notificationService.error(error));
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
index 42f909ce560..104644f1c7f 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
@@ -8,17 +8,15 @@
 import * as arrays from 'vs/base/common/arrays';
 import { localize } from 'vs/nls';
 import { Event, chain, anyEvent, debounceEvent } from 'vs/base/common/event';
-import { onUnexpectedError, canceled } from 'vs/base/common/errors';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService, IExtensionTipsService, LocalExtensionType, IExtensionIdentifier, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService, IExtensionTipsService, IExtensionIdentifier, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { BetterMergeDisabledNowKey, BetterMergeId, areSameExtensions, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { areSameExtensions, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 
@@ -63,36 +61,37 @@ export class KeymapExtensions implements IWorkbenchContribution {
 		});
 	}
 
-	private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): TPromise<void> {
-		const message = localize('disableOtherKeymapsConfirmation', "Disable other keymaps ({0}) to avoid conflicts between keybindings?", oldKeymaps.map(k => `'${k.local.manifest.displayName}'`).join(', '));
-		const options = [
-			localize('yes', "Yes"),
-			localize('no', "No")
-		];
-		return this.notificationService.prompt(Severity.Info, message, options)
-			.then(value => {
-				const confirmed = value === 0;
-				const telemetryData: { [key: string]: any; } = {
-					newKeymap: newKeymap.identifier,
-					oldKeymaps: oldKeymaps.map(k => k.identifier),
-					confirmed
-				};
-				/* __GDPR__
-					"disableOtherKeymaps" : {
-						"newKeymap": { "${inline}": [ "${ExtensionIdentifier}" ] },
-						"oldKeymaps": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"confirmed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
-					}
-				*/
-				this.telemetryService.publicLog('disableOtherKeymaps', telemetryData);
-				if (confirmed) {
-					return TPromise.join(oldKeymaps.map(keymap => {
-						return this.extensionEnablementService.setEnablement(keymap.local, EnablementState.Disabled);
-					}));
+	private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): void {
+		const onPrompt = (confirmed: boolean) => {
+			const telemetryData: { [key: string]: any; } = {
+				newKeymap: newKeymap.identifier,
+				oldKeymaps: oldKeymaps.map(k => k.identifier),
+				confirmed
+			};
+			/* __GDPR__
+				"disableOtherKeymaps" : {
+					"newKeymap": { "${inline}": [ "${ExtensionIdentifier}" ] },
+					"oldKeymaps": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"confirmed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 				}
-				return undefined;
-			}, error => TPromise.wrapError(canceled()))
-			.then(() => { /* drop resolved value */ });
+			*/
+			this.telemetryService.publicLog('disableOtherKeymaps', telemetryData);
+			if (confirmed) {
+				TPromise.join(oldKeymaps.map(keymap => {
+					return this.extensionEnablementService.setEnablement(keymap.local, EnablementState.Disabled);
+				}));
+			}
+		};
+
+		this.notificationService.prompt(Severity.Info, localize('disableOtherKeymapsConfirmation', "Disable other keymaps ({0}) to avoid conflicts between keybindings?", oldKeymaps.map(k => `'${k.local.manifest.displayName}'`).join(', ')),
+			[{
+				label: localize('yes', "Yes"),
+				run: () => onPrompt(true)
+			}, {
+				label: localize('no', "No"),
+				run: () => onPrompt(false)
+			}]
+		);
 	}
 
 	dispose(): void {
@@ -143,29 +142,3 @@ export function isKeymapExtension(tipsService: IExtensionTipsService, extension:
 function stripVersion(id: string): string {
 	return getIdAndVersionFromLocalExtensionId(id).id;
 }
-
-export class BetterMergeDisabled implements IWorkbenchContribution {
-
-	constructor(
-		@IStorageService storageService: IStorageService,
-		@INotificationService notificationService: INotificationService,
-		@IExtensionService extensionService: IExtensionService,
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
-		@ITelemetryService telemetryService: ITelemetryService,
-	) {
-		extensionService.whenInstalledExtensionsRegistered().then(() => {
-			if (storageService.getBoolean(BetterMergeDisabledNowKey, StorageScope.GLOBAL, false)) {
-				storageService.remove(BetterMergeDisabledNowKey, StorageScope.GLOBAL);
-
-				notificationService.prompt(Severity.Info, localize('betterMergeDisabled', "The Better Merge extension is now built-in, the installed extension was disabled and can be uninstalled."), [localize('uninstall', "Uninstall")]).then(choice => {
-					if (choice === 0) {
-						extensionManagementService.getInstalled(LocalExtensionType.User).then(extensions => {
-							return Promise.all(extensions.filter(e => stripVersion(e.identifier.id) === BetterMergeId)
-								.map(e => extensionManagementService.uninstall(e, true)));
-						});
-					}
-				});
-			}
-		});
-	}
-}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 516a1d76d6c..ca6ef161be3 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -535,13 +535,14 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 
 				if (maliciousExtensions.length) {
 					return TPromise.join(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e, true).then(() => {
-						return this.notificationService.prompt(Severity.Warning, localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", getGalleryExtensionIdFromLocal(e)), [localize('reloadNow', "Reload Now")]).then(choice => {
-							if (choice === 0) {
-								return this.windowService.reloadWindow();
-							}
-
-							return TPromise.as(undefined);
-						});
+						this.notificationService.prompt(
+							Severity.Warning,
+							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", getGalleryExtensionIdFromLocal(e)),
+							[{
+								label: localize('reloadNow', "Reload Now"),
+								run: () => this.windowService.reloadWindow()
+							}]
+						);
 					})));
 				} else {
 					return TPromise.as(null);
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index 77f8b5b09b5..cabf01e5411 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -1003,17 +1003,14 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 
 				return this.windowService.show().then(() => {
 					return this.open(extension).then(() => {
-						const message = nls.localize('installConfirmation', "Would you like to install the '{0}' extension?", extension.displayName, extension.publisher);
-						const options = [
-							nls.localize('install', "Install")
-						];
-						return this.notificationService.prompt(Severity.Info, message, options).then(value => {
-							if (value === 0) {
-								return this.install(extension);
-							}
-
-							return TPromise.as(null);
-						});
+						this.notificationService.prompt(
+							Severity.Info,
+							nls.localize('installConfirmation', "Would you like to install the '{0}' extension?", extension.displayName, extension.publisher),
+							[{
+								label: nls.localize('install', "Install"),
+								run: () => this.install(extension).done(undefined, error => this.onError(error))
+							}]
+						);
 					});
 				});
 			});
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
index fd2f7e41c28..98b711a62e8 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
@@ -45,7 +45,7 @@ import product from 'vs/platform/node/product';
 import { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { URLService } from 'vs/platform/url/common/urlService';
 
 const mockExtensionGallery: IGalleryExtension[] = [
@@ -223,9 +223,9 @@ suite('ExtensionsTipsService Test', () => {
 		prompted = false;
 
 		class TestNotificationService2 extends TestNotificationService {
-			public prompt() {
+			public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void) {
 				prompted = true;
-				return TPromise.as(3);
+				return null;
 			}
 		}
 
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
index 0056fa9eb60..7832bc03939 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
@@ -103,11 +103,12 @@ export class BaseErrorReportingAction extends Action {
 	}
 
 	protected onErrorWithRetry(error: any, retry: () => TPromise<any>): void {
-		this._notificationService.prompt(Severity.Error, toErrorMessage(error, false), [nls.localize('retry', "Retry")]).then(choice => {
-			if (choice === 0) {
-				retry();
-			}
-		});
+		this._notificationService.prompt(Severity.Error, toErrorMessage(error, false),
+			[{
+				label: nls.localize('retry', "Retry"),
+				run: () => retry()
+			}]
+		);
 	}
 }
 
diff --git a/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts b/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts
index 4d111bf50d3..1c89acd7c6f 100644
--- a/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts
+++ b/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts
@@ -64,17 +64,25 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 		if (!this.storageService.getBoolean(donotAskUpdateKey) && e.local && e.local.manifest.contributes && e.local.manifest.contributes.localizations && e.local.manifest.contributes.localizations.length) {
 			const locale = e.local.manifest.contributes.localizations[0].languageId;
 			if (language !== locale) {
-				const updateLocaleMessage = localize('updateLocale', "Would you like to change VS Code's UI language to {0} and restart?", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId);
-				this.notificationService.prompt(Severity.Info, updateLocaleMessage, [localize('yes', "Yes"), localize('no', "No"), localize('doNotAskAgain', "Do not ask me again")])
-					.then(option => {
-						if (option === 0) {
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('updateLocale', "Would you like to change VS Code's UI language to {0} and restart?", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId),
+					[{
+						label: localize('yes', "Yes"),
+						run: () => {
 							const file = URI.file(join(this.environmentService.appSettingsHome, 'locale.json'));
 							this.jsonEditingService.write(file, { key: 'locale', value: locale }, true)
 								.then(() => this.windowsService.relaunch({}), e => this.notificationService.error(e));
-						} else if (option === 2) {
-							this.storageService.store(donotAskUpdateKey, true);
 						}
-					});
+					}, {
+						label: localize('no', "No"),
+						run: () => { }
+					}, {
+						label: localize('neverAgain', "Don't Show Again"),
+						isSecondary: true,
+						run: () => this.storageService.store(donotAskUpdateKey, true)
+					}]
+				);
 			}
 		}
 	}
diff --git a/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts b/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
index e4f90adef38..22c74d78dc7 100644
--- a/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
+++ b/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
@@ -17,7 +17,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import pkg from 'vs/platform/node/package';
 import product, { ISurveyData } from 'vs/platform/node/product';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 
 class LanguageSurvey {
 
@@ -87,30 +87,36 @@ class LanguageSurvey {
 		// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
 		telemetryService.publicLog(`${data.surveyId}.survey/userAsked`);
 
-		const choices: PromptOption[] = [nls.localize('takeShortSurvey', "Take Short Survey"), nls.localize('remindLater', "Remind Me later"), { label: nls.localize('neverAgain', "Don't Show Again") }];
-		notificationService.prompt(Severity.Info, nls.localize('helpUs', "Help us improve our support for {0}", data.languageId), choices).then(choice => {
-			switch (choice) {
-				case 0 /* Take Survey */:
+		notificationService.prompt(
+			Severity.Info,
+			nls.localize('helpUs', "Help us improve our support for {0}", data.languageId),
+			[{
+				label: nls.localize('takeShortSurvey', "Take Short Survey"),
+				run: () => {
 					telemetryService.publicLog(`${data.surveyId}.survey/takeShortSurvey`);
 					telemetryService.getTelemetryInfo().then(info => {
 						window.open(`${data.surveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
 						storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 						storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
 					});
-					break;
-				case 1 /* Remind Later */:
+				}
+			}, {
+				label: nls.localize('remindLater', "Remind Me later"),
+				run: () => {
 					telemetryService.publicLog(`${data.surveyId}.survey/remindMeLater`);
 					storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
-					break;
-				case 2 /* Never show again */:
+				}
+			}, {
+				label: nls.localize('neverAgain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
 					telemetryService.publicLog(`${data.surveyId}.survey/dontShowAgain`);
 					storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 					storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-					break;
-			}
-		});
+				}
+			}]
+		);
 	}
-
 }
 
 class LanguageSurveysContribution implements IWorkbenchContribution {
diff --git a/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts b/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
index 74d76dfd627..5313485e412 100644
--- a/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
+++ b/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
@@ -15,7 +15,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 
 const PROBABILITY = 0.15;
 const SESSION_COUNT_KEY = 'nps/sessionCount';
@@ -62,25 +62,30 @@ class NPSContribution implements IWorkbenchContribution {
 			return;
 		}
 
-		const choices: PromptOption[] = [nls.localize('takeSurvey', "Take Survey"), nls.localize('remindLater', "Remind Me later"), { label: nls.localize('neverAgain', "Don't Show Again") }];
-		notificationService.prompt(Severity.Info, nls.localize('surveyQuestion', "Do you mind taking a quick feedback survey?"), choices).then(choice => {
-			switch (choice) {
-				case 0 /* Take Survey */:
+		notificationService.prompt(
+			Severity.Info,
+			nls.localize('surveyQuestion', "Do you mind taking a quick feedback survey?"),
+			[{
+				label: nls.localize('takeSurvey', "Take Survey"),
+				run: () => {
 					telemetryService.getTelemetryInfo().then(info => {
 						window.open(`${product.npsSurveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
 						storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 						storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
 					});
-					break;
-				case 1 /* Remind Later */:
-					storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
-					break;
-				case 2 /* Never show again */:
+				}
+			}, {
+				label: nls.localize('remindLater', "Remind Me later"),
+				run: () => storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL)
+			}, {
+				label: nls.localize('neverAgain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
 					storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 					storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-					break;
-			}
-		});
+				}
+			}]
+		);
 	}
 }
 
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
index 7bf86924378..03a0b389ef4 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -498,14 +498,17 @@ class TaskService implements ITaskService {
 			let folderSetup = this.computeWorkspaceFolderSetup();
 			if (this.executionEngine !== folderSetup[2]) {
 				if (this._taskSystem && this._taskSystem.getActiveTasks().length > 0) {
-					this.notificationService.prompt(Severity.Info, nls.localize(
-						'TaskSystem.noHotSwap',
-						'Changing the task execution engine with an active task running requires to reload the Window'
-					), [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
-						if (choice === 0) {
-							this._windowService.reloadWindow();
-						}
-					});
+					this.notificationService.prompt(
+						Severity.Info,
+						nls.localize(
+							'TaskSystem.noHotSwap',
+							'Changing the task execution engine with an active task running requires to reload the Window'
+						),
+						[{
+							label: nls.localize('reloadWindow', "Reload Window"),
+							run: () => this._windowService.reloadWindow()
+						}]
+					);
 					return;
 				} else {
 					this.disposeTaskSystemListeners();
@@ -1850,24 +1853,18 @@ class TaskService implements ITaskService {
 			return TPromise.as(undefined);
 		}
 
-		const action = new Action('dontShowAgain', nls.localize('TaskService.notAgain', 'Don\'t Show Again'), null, true, (notification: IDisposable) => {
-			this.storageService.store(TaskService.IgnoreTask010DonotShowAgain_key, true, StorageScope.WORKSPACE);
-			this.__showIgnoreMessage = false;
-
-			// Hide notification
-			notification.dispose();
-
-			return TPromise.as(true);
-		});
-
-		const handle = this.notificationService.notify({
-			severity: Severity.Info,
-			message: nls.localize('TaskService.ignoredFolder', 'The following workspace folders are ignored since they use task version 0.1.0: {0}', this.ignoredWorkspaceFolders.map(f => f.name).join(', ')),
-			actions: {
-				secondary: [action]
-			}
-		});
-		once(handle.onDidDispose)(() => action.dispose());
+		this.notificationService.prompt(
+			Severity.Info,
+			nls.localize('TaskService.ignoredFolder', 'The following workspace folders are ignored since they use task version 0.1.0: {0}', this.ignoredWorkspaceFolders.map(f => f.name).join(', ')),
+			[{
+				label: nls.localize('TaskService.notAgain', 'Don\'t Show Again'),
+				isSecondary: true,
+				run: () => {
+					this.storageService.store(TaskService.IgnoreTask010DonotShowAgain_key, true, StorageScope.WORKSPACE);
+					this.__showIgnoreMessage = false;
+				}
+			}]
+		);
 
 		return TPromise.as(undefined);
 	}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
index 314511a4e90..243f7094819 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
@@ -163,18 +163,16 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 			} else { // if (shellArgsConfigValue.workspace !== undefined)
 				changeString = `shellArgs: ${argsString}`;
 			}
-			const message = nls.localize('terminal.integrated.allowWorkspaceShell', "Do you allow {0} (defined as a workspace setting) to be launched in the terminal?", changeString);
-			const options = [nls.localize('allow', "Allow"), nls.localize('disallow', "Disallow")];
-			this._notificationService.prompt(Severity.Info, message, options).then(choice => {
-				switch (choice) {
-					case 0:  /* Allow */
-						this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, true, StorageScope.WORKSPACE);
-						break;
-					case 1:  /* Disallow */
-						this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, false, StorageScope.WORKSPACE);
-						break;
-				}
-			});
+			this._notificationService.prompt(Severity.Info, nls.localize('terminal.integrated.allowWorkspaceShell', "Do you allow {0} (defined as a workspace setting) to be launched in the terminal?", changeString),
+				[{
+					label: nls.localize('allow', "Allow"),
+					run: () => this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, true, StorageScope.WORKSPACE)
+				},
+				{
+					label: nls.localize('disallow', "Disallow"),
+					run: () => this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, false, StorageScope.WORKSPACE)
+				}]
+			);
 		}
 
 		shell.executable = (isWorkspaceShellAllowed ? shellConfigValue.value : shellConfigValue.user) || shellConfigValue.default;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index 95f9e18ddf5..a09efd1925d 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -23,7 +23,7 @@ import { getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/elec
 import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
 import { TerminalTab } from 'vs/workbench/parts/terminal/electron-browser/terminalTab';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ipcRenderer as ipc } from 'electron';
 import { IOpenFileRequest } from 'vs/platform/windows/common/windows';
 
@@ -142,11 +142,12 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 			return;
 		}
 
-		const message = nls.localize('terminal.integrated.chooseWindowsShellInfo', "You can change the default terminal shell by selecting the customize button.");
-		const options: PromptOption[] = [nls.localize('customize', "Customize"), { label: nls.localize('never again', "Don't Show Again") }];
-		this._notificationService.prompt(Severity.Info, message, options).then(choice => {
-			switch (choice) {
-				case 0 /* Customize */:
+		this._notificationService.prompt(
+			Severity.Info,
+			nls.localize('terminal.integrated.chooseWindowsShellInfo', "You can change the default terminal shell by selecting the customize button."),
+			[{
+				label: nls.localize('customize', "Customize"),
+				run: () => {
 					this.selectDefaultWindowsShell().then(shell => {
 						if (!shell) {
 							return TPromise.as(null);
@@ -161,12 +162,14 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 						}
 						return TPromise.as(null);
 					});
-					break;
-				case 1 /* Do not show again */:
-					this._storageService.store(NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, true);
-					break;
-			}
-		});
+				}
+			},
+			{
+				label: nls.localize('never again', "Don't Show Again"),
+				isSecondary: true,
+				run: () => this._storageService.store(NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, true)
+			}]
+		);
 	}
 
 	public selectDefaultWindowsShell(): TPromise<string> {
diff --git a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
index 7d2c890eafc..904c597c9f6 100644
--- a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
+++ b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
@@ -14,7 +14,7 @@ import { IPreferencesService } from 'vs/workbench/parts/preferences/common/prefe
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 
 class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution {
 
@@ -60,18 +60,21 @@ class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution
 	}
 
 	private showWarning(unsupportedKeys: string[]): void {
-		const choices: PromptOption[] = [nls.localize('openWorkspaceSettings', 'Open Workspace Settings'), { label: nls.localize('dontShowAgain', 'Don\'t Show Again') }];
-		this.notificationService.prompt(Severity.Warning, nls.localize('unsupportedWorkspaceSettings', 'This Workspace contains settings that can only be set in User Settings ({0}). Click [here]({1}) to learn more.', unsupportedKeys.join(', '), 'https://go.microsoft.com/fwlink/?linkid=839878'), choices).then(choice => {
-			switch (choice) {
-				case 0 /* Open Workspace Settings */:
+		this.notificationService.prompt(
+			Severity.Warning,
+			nls.localize('unsupportedWorkspaceSettings', 'This Workspace contains settings that can only be set in User Settings ({0}). Click [here]({1}) to learn more.', unsupportedKeys.join(', '), 'https://go.microsoft.com/fwlink/?linkid=839878'),
+			[{
+				label: nls.localize('openWorkspaceSettings', 'Open Workspace Settings'),
+				run: () => {
 					this.rememberWarningWasShown();
 					this.preferencesService.openWorkspaceSettings();
-					break;
-				case 1 /* Never show again */:
-					this.rememberWarningWasShown();
-					break;
-			}
-		});
+				}
+			}, {
+				label: nls.localize('dontShowAgain', 'Don\'t Show Again'),
+				isSecondary: true,
+				run: () => this.rememberWarningWasShown()
+			}]
+		);
 	}
 }
 
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 4a8dad69dbc..8c1ab586a7b 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -29,17 +29,8 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ReleaseNotesManager } from './releaseNotesEditor';
-import { once } from 'vs/base/common/event';
 import { isWindows } from 'vs/base/common/platform';
 
-const NotNowAction = new Action(
-	'update.later',
-	nls.localize('later', "Later"),
-	null,
-	true,
-	() => TPromise.as(true)
-);
-
 let releaseNotesManager: ReleaseNotesManager | undefined = undefined;
 
 function showReleaseNotes(instantiationService: IInstantiationService, version: string) {
@@ -123,7 +114,8 @@ export class ProductContribution implements IWorkbenchContribution {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@INotificationService notificationService: INotificationService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
-		@IEnvironmentService environmentService: IEnvironmentService
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IOpenerService openerService: IOpenerService
 	) {
 		const lastVersion = storageService.get(ProductContribution.KEY, StorageScope.GLOBAL, '');
 
@@ -131,13 +123,17 @@ export class ProductContribution implements IWorkbenchContribution {
 		if (!environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
 			showReleaseNotes(instantiationService, lastVersion)
 				.then(undefined, () => {
-					const action = instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction);
-					const handle = notificationService.notify({
-						severity: severity.Info,
-						message: nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
-						actions: { primary: [action] }
-					});
-					once(handle.onDidDispose)(() => action.dispose());
+					notificationService.prompt(
+						severity.Info,
+						nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
+						[{
+							label: nls.localize('releaseNotes', "Release Notes"),
+							run: () => {
+								const uri = URI.parse(product.releaseNotesUrl);
+								openerService.open(uri);
+							}
+						}]
+					);
 				});
 		}
 
@@ -180,7 +176,7 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 	constructor(
 		@IStorageService storageService: IStorageService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService,
+		@INotificationService notificationService: INotificationService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IEnvironmentService environmentService: IEnvironmentService
 	) {
@@ -198,12 +194,18 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 			? Win3264BitContribution.INSIDER_URL
 			: Win3264BitContribution.URL;
 
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('64bitisavailable', "{0} for 64-bit Windows is now available! Click [here]({1}) to learn more.", product.nameShort, url),
-			actions: { secondary: [neverShowAgain.action] }
-		});
-		once(handle.onDidDispose)(() => neverShowAgain.action.dispose());
+		notificationService.prompt(
+			severity.Info,
+			nls.localize('64bitisavailable', "{0} for 64-bit Windows is now available! Click [here]({1}) to learn more.", product.nameShort, url),
+			[{
+				label: nls.localize('neveragain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
+					neverShowAgain.action.run();
+					neverShowAgain.action.dispose();
+				}
+			}]
+		);
 	}
 }
 
@@ -328,16 +330,24 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-		const downloadAction = new Action('update.downloadNow', nls.localize('download now', "Download Now"), null, true, () =>
-			this.updateService.downloadUpdate());
-
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('thereIsUpdateAvailable', "There is an available update."),
-			actions: { primary: [downloadAction, NotNowAction, releaseNotesAction] }
-		});
-		once(handle.onDidDispose)(() => dispose(releaseNotesAction, downloadAction));
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('thereIsUpdateAvailable', "There is an available update."),
+			[{
+				label: nls.localize('download now', "Download Now"),
+				run: () => this.updateService.downloadUpdate()
+			}, {
+				label: nls.localize('later', "Later"),
+				run: () => { }
+			}, {
+				label: nls.localize('releaseNotes', "Release Notes"),
+				run: () => {
+					const action = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+					action.run();
+					action.dispose();
+				}
+			}]
+		);
 	}
 
 	// windows fast updates
@@ -346,16 +356,24 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-		const installUpdateAction = new Action('update.applyUpdate', nls.localize('installUpdate', "Install Update"), undefined, true, () =>
-			this.updateService.applyUpdate());
-
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('updateAvailable', "There's an update available: {0} {1}", product.nameLong, update.productVersion),
-			actions: { primary: [installUpdateAction, NotNowAction, releaseNotesAction] }
-		});
-		once(handle.onDidDispose)(() => dispose(installUpdateAction, releaseNotesAction));
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('updateAvailable', "There's an update available: {0} {1}", product.nameLong, update.productVersion),
+			[{
+				label: nls.localize('installUpdate', "Install Update"),
+				run: () => this.updateService.applyUpdate()
+			}, {
+				label: nls.localize('later', "Later"),
+				run: () => { }
+			}, {
+				label: nls.localize('releaseNotes', "Release Notes"),
+				run: () => {
+					const action = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+					action.run();
+					action.dispose();
+				}
+			}]
+		);
 	}
 
 	// windows fast updates
@@ -366,12 +384,18 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('updateInstalling', "{0} {1} is being installed in the background, we'll let you know when it's done.", product.nameLong, update.productVersion),
-			actions: { secondary: [neverShowAgain.action] }
-		});
-		once(handle.onDidDispose)(() => neverShowAgain.action.dispose());
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('updateInstalling', "{0} {1} is being installed in the background, we'll let you know when it's done.", product.nameLong, update.productVersion),
+			[{
+				label: nls.localize('neveragain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
+					neverShowAgain.action.run();
+					neverShowAgain.action.dispose();
+				}
+			}]
+		);
 	}
 
 	// windows and mac
@@ -380,16 +404,24 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-		const applyUpdateAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () =>
-			this.updateService.quitAndInstall());
-
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", product.nameLong),
-			actions: { primary: [applyUpdateAction, NotNowAction, releaseNotesAction] }
-		});
-		once(handle.onDidDispose)(() => dispose(applyUpdateAction, releaseNotesAction));
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", product.nameLong),
+			[{
+				label: nls.localize('updateNow', "Update Now"),
+				run: () => this.updateService.quitAndInstall()
+			}, {
+				label: nls.localize('later', "Later"),
+				run: () => { }
+			}, {
+				label: nls.localize('releaseNotes', "Release Notes"),
+				run: () => {
+					const action = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+					action.run();
+					action.dispose();
+				}
+			}]
+		);
 	}
 
 	private shouldShowNotification(): boolean {
diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
index 9dea022290c..49a9d309bbf 100644
--- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
+++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
@@ -43,8 +43,15 @@ export class TelemetryOptOut implements IWorkbenchContribution {
 			const privacyUrl = product.privacyStatementUrl || product.telemetryOptOutUrl;
 			const optOutNotice = localize('telemetryOptOut.optOutNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt out]({1}).", privacyUrl, optOutUrl);
 			const optInNotice = localize('telemetryOptOut.optInNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt in]({1}).", privacyUrl, optOutUrl);
-			return notificationService.prompt(Severity.Info, telemetryService.isOptedIn ? optOutNotice : optInNotice, [localize('telemetryOptOut.readMore', "Read More")])
-				.then(() => openerService.open(URI.parse(optOutUrl)));
+
+			notificationService.prompt(
+				Severity.Info,
+				telemetryService.isOptedIn ? optOutNotice : optInNotice,
+				[{
+					label: localize('telemetryOptOut.readMore', "Read More"),
+					run: () => openerService.open(URI.parse(optOutUrl))
+				}]
+			);
 		})
 			.then(null, onUnexpectedError);
 	}
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index 290a2b95ac3..21f183d2458 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -427,9 +427,12 @@ class WelcomePage {
 						});
 				});
 
-			this.notificationService.prompt(Severity.Info, strings.reloadAfterInstall.replace('{0}', extensionSuggestion.name), [localize('ok', "OK"), localize('details', "Details")]).then(choice => {
-				switch (choice) {
-					case 0 /* OK */:
+			this.notificationService.prompt(
+				Severity.Info,
+				strings.reloadAfterInstall.replace('{0}', extensionSuggestion.name),
+				[{
+					label: localize('ok', "OK"),
+					run: () => {
 						const messageDelay = TPromise.timeout(300);
 						messageDelay.then(() => {
 							this.notificationService.info(strings.installing.replace('{0}', extensionSuggestion.name));
@@ -491,8 +494,10 @@ class WelcomePage {
 								});
 								this.notificationService.error(err);
 							});
-						break;
-					case 1 /* Details */:
+					}
+				}, {
+					label: localize('details', "Details"),
+					run: () => {
 						/* __GDPR__FRAGMENT__
 							"WelcomePageDetails-1" : {
 								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -506,9 +511,9 @@ class WelcomePage {
 						this.extensionsWorkbenchService.queryGallery({ names: [extensionSuggestion.id] })
 							.then(result => this.extensionsWorkbenchService.open(result.firstPage[0]))
 							.then(null, onUnexpectedError);
-						break;
-				}
-			});
+					}
+				}]
+			);
 		}).then(null, err => {
 			/* __GDPR__FRAGMENT__
 				"WelcomePageInstalled-6" : {
diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
index b242c7188c6..065e6601dd6 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -192,19 +192,19 @@ export class ConfigurationEditingService {
 			: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? nls.localize('openLaunchConfiguration', "Open Launch Configuration")
 				: null;
 		if (openStandAloneConfigurationActionLabel) {
-			this.notificationService.prompt(Severity.Error, error.message, [openStandAloneConfigurationActionLabel])
-				.then(option => {
-					if (option === 0) {
-						this.openFile(operation.resource);
-					}
-				});
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: openStandAloneConfigurationActionLabel,
+					run: () => this.openFile(operation.resource)
+				}]
+			);
 		} else {
-			this.notificationService.prompt(Severity.Error, error.message, [nls.localize('open', "Open Settings")])
-				.then(option => {
-					if (option === 0) {
-						this.openSettings(operation);
-					}
-				});
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: nls.localize('open', "Open Settings"),
+					run: () => this.openSettings(operation)
+				}]
+			);
 		}
 	}
 
@@ -213,30 +213,30 @@ export class ConfigurationEditingService {
 			: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? nls.localize('openLaunchConfiguration', "Open Launch Configuration")
 				: null;
 		if (openStandAloneConfigurationActionLabel) {
-			this.notificationService.prompt(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), openStandAloneConfigurationActionLabel])
-				.then(option => {
-					switch (option) {
-						case 0 /* Save & Retry */:
-							const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
-							this.writeConfiguration(operation.target, { key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
-							break;
-						case 1 /* Open Config */:
-							this.openFile(operation.resource);
-							break;
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: nls.localize('saveAndRetry', "Save and Retry"),
+					run: () => {
+						const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
+						this.writeConfiguration(operation.target, { key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
 					}
-				});
+				},
+				{
+					label: openStandAloneConfigurationActionLabel,
+					run: () => this.openFile(operation.resource)
+				}]
+			);
 		} else {
-			this.notificationService.prompt(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), nls.localize('open', "Open Settings")])
-				.then(option => {
-					switch (option) {
-						case 0 /* Save and Retry */:
-							this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
-							break;
-						case 1 /* Open Settings */:
-							this.openSettings(operation);
-							break;
-					}
-				});
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: nls.localize('saveAndRetry', "Save and Retry"),
+					run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes })
+				},
+				{
+					label: nls.localize('open', "Open Settings"),
+					run: () => this.openSettings(operation)
+				}]
+			);
 		}
 	}
 
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index d91ed2b458c..c57272a6b22 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -235,11 +235,12 @@ export class ExtensionHostProcessWorker {
 							? nls.localize('extensionHostProcess.startupFailDebug', "Extension host did not start in 10 seconds, it might be stopped on the first line and needs a debugger to continue.")
 							: nls.localize('extensionHostProcess.startupFail', "Extension host did not start in 10 seconds, that might be a problem.");
 
-						this._notificationService.prompt(Severity.Warning, msg, [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
-							if (choice === 0) {
-								this._windowService.reloadWindow();
-							}
-						});
+						this._notificationService.prompt(Severity.Warning, msg,
+							[{
+								label: nls.localize('reloadWindow', "Reload Window"),
+								run: () => this._windowService.reloadWindow()
+							}]
+						);
 					}, 10000);
 				}
 
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index b4ec2e94433..4d64bdc8415 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -386,16 +386,16 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			message = nls.localize('extensionHostProcess.unresponsiveCrash', "Extension host terminated because it was not responsive.");
 		}
 
-		this._notificationService.prompt(Severity.Error, message, [nls.localize('devTools', "Developer Tools"), nls.localize('restart', "Restart Extension Host")]).then(choice => {
-			switch (choice) {
-				case 0 /* Open Dev Tools */:
-					this._windowService.openDevTools();
-					break;
-				case 1 /* Restart Extension Host */:
-					this._startExtensionHostProcess(Object.keys(this._allRequestedActivateEvents));
-					break;
-			}
-		});
+		this._notificationService.prompt(Severity.Error, message,
+			[{
+				label: nls.localize('devTools', "Open Developer Tools"),
+				run: () => this._windowService.openDevTools()
+			},
+			{
+				label: nls.localize('restart', "Restart Extension Host"),
+				run: () => this._startExtensionHostProcess(Object.keys(this._allRequestedActivateEvents))
+			}]
+		);
 	}
 
 	// ---- begin IExtensionService
@@ -638,11 +638,14 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			console.error(err);
 		}
 
-		notificationService.prompt(Severity.Error, nls.localize('extensionCache.invalid', "Extensions have been modified on disk. Please reload the window."), [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
-			if (choice === 0) {
-				windowService.reloadWindow();
-			}
-		});
+		notificationService.prompt(
+			Severity.Error,
+			nls.localize('extensionCache.invalid', "Extensions have been modified on disk. Please reload the window."),
+			[{
+				label: nls.localize('reloadWindow', "Reload Window"),
+				run: () => windowService.reloadWindow()
+			}]
+		);
 	}
 
 	private static async _readExtensionCache(environmentService: IEnvironmentService, cacheKey: string): TPromise<IExtensionCacheData> {
diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index 7adb118fced..cb2fa1e771f 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -24,7 +24,7 @@ import { ITextResourceConfigurationService } from 'vs/editor/common/services/res
 import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import product from 'vs/platform/node/product';
 import { Schemas } from 'vs/base/common/network';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 import { WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
 
 export class FileService implements IFileService {
@@ -109,32 +109,36 @@ export class FileService implements IFileService {
 
 		// Detect if we run < .NET Framework 4.5 (TODO@ben remove with new watcher impl)
 		if (msg.indexOf(FileService.NET_VERSION_ERROR) >= 0 && !this.storageService.getBoolean(FileService.NET_VERSION_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
-			const choices: PromptOption[] = [nls.localize('installNet', "Download .NET Framework 4.5"), { label: nls.localize('neverShowAgain', "Don't Show Again") }];
-			this.notificationService.prompt(Severity.Warning, nls.localize('netVersionError', "The Microsoft .NET Framework 4.5 is required. Please follow the link to install it."), choices).then(choice => {
-				switch (choice) {
-					case 0 /* Read More */:
-						window.open('https://go.microsoft.com/fwlink/?LinkId=786533');
-						break;
-					case 1 /* Never show again */:
-						this.storageService.store(FileService.NET_VERSION_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE);
-						break;
-				}
-			});
+			this.notificationService.prompt(
+				Severity.Warning,
+				nls.localize('netVersionError', "The Microsoft .NET Framework 4.5 is required. Please follow the link to install it."),
+				[{
+					label: nls.localize('installNet', "Download .NET Framework 4.5"),
+					run: () => window.open('https://go.microsoft.com/fwlink/?LinkId=786533')
+				},
+				{
+					label: nls.localize('neverShowAgain', "Don't Show Again"),
+					isSecondary: true,
+					run: () => this.storageService.store(FileService.NET_VERSION_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE)
+				}]
+			);
 		}
 
 		// Detect if we run into ENOSPC issues
 		if (msg.indexOf(FileService.ENOSPC_ERROR) >= 0 && !this.storageService.getBoolean(FileService.ENOSPC_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
-			const choices: PromptOption[] = [nls.localize('learnMore', "Instructions"), { label: nls.localize('neverShowAgain', "Don't Show Again") }];
-			this.notificationService.prompt(Severity.Warning, nls.localize('enospcError', "{0} is unable to watch for file changes in this large workspace. Please follow the instructions link to resolve this issue.", product.nameLong), choices).then(choice => {
-				switch (choice) {
-					case 0 /* Read More */:
-						window.open('https://go.microsoft.com/fwlink/?linkid=867693');
-						break;
-					case 1 /* Never show again */:
-						this.storageService.store(FileService.ENOSPC_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE);
-						break;
-				}
-			});
+			this.notificationService.prompt(
+				Severity.Warning,
+				nls.localize('enospcError', "{0} is unable to watch for file changes in this large workspace. Please follow the instructions link to resolve this issue.", product.nameLong),
+				[{
+					label: nls.localize('learnMore', "Instructions"),
+					run: () => window.open('https://go.microsoft.com/fwlink/?linkid=867693')
+				},
+				{
+					label: nls.localize('neverShowAgain', "Don't Show Again"),
+					isSecondary: true,
+					run: () => this.storageService.store(FileService.ENOSPC_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE)
+				}]
+			);
 		}
 	}
 
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index 815873ed0ff..d2cd39a8132 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, PromptOption, INotificationActions } from 'vs/platform/notification/common/notification';
+import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, INotificationActions, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { INotificationsModel, NotificationsModel } from 'vs/workbench/common/notifications';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -65,61 +65,49 @@ export class NotificationService implements INotificationService {
 		return this.model.notify(notification);
 	}
 
-	public prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
+	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
 		let handle: INotificationHandle;
+		let choiceClicked = false;
 
-		const promise = new TPromise<number>(c => {
+		// Convert choices into primary/secondary actions
+		const actions: INotificationActions = { primary: [], secondary: [] };
+		choices.forEach((choice, index) => {
+			const action = new Action(`workbench.dialog.choice.${index}`, choice.label, null, true, () => {
+				choiceClicked = true;
 
-			// Complete promise with index of action that was picked
-			const callback = (index: number, closeNotification: boolean) => () => {
-				c(index);
+				// Pass to runner
+				choice.run();
 
-				if (closeNotification) {
+				// Close notification unless we are told to keep open
+				if (!choice.keepOpen) {
 					handle.dispose();
 				}
 
 				return TPromise.as(void 0);
-			};
-
-			// Convert choices into primary/secondary actions
-			const actions: INotificationActions = {
-				primary: [],
-				secondary: []
-			};
-
-			choices.forEach((choice, index) => {
-				let isPrimary = true;
-				let label: string;
-				let closeNotification = false;
-
-				if (typeof choice === 'string') {
-					label = choice;
-				} else {
-					isPrimary = false;
-					label = choice.label;
-					closeNotification = !choice.keepOpen;
-				}
-
-				const action = new Action(`workbench.dialog.choice.${index}`, label, null, true, callback(index, closeNotification));
-				if (isPrimary) {
-					actions.primary.push(action);
-				} else {
-					actions.secondary.push(action);
-				}
 			});
 
-			// Show notification with actions
-			handle = this.notify({ severity, message, actions });
+			if (!choice.isSecondary) {
+				actions.primary.push(action);
+			} else {
+				actions.secondary.push(action);
+			}
+		});
 
-			// Cancel promise and cleanup when notification gets disposed
-			once(handle.onDidDispose)(() => {
-				dispose(...actions.primary, ...actions.secondary);
-				promise.cancel();
-			});
+		// Show notification with actions
+		handle = this.notify({ severity, message, actions });
 
-		}, () => handle.dispose());
+		once(handle.onDidDispose)(() => {
 
-		return promise;
+			// Cleanup when notification gets disposed
+			dispose(...actions.primary, ...actions.secondary);
+
+			// Indicate cancellation to the outside if no action was executed
+			if (!choiceClicked && typeof onCancel === 'function') {
+				onCancel();
+			}
+		});
+
+		return handle;
 	}
 
 	public dispose(): void {
diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
index f5acaa9c5ba..5e8f0fb6ca9 100644
--- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
@@ -155,31 +155,33 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 	private handleWorkspaceConfigurationEditingError(error: JSONEditingError): TPromise<void> {
 		switch (error.code) {
 			case JSONEditingErrorCode.ERROR_INVALID_FILE:
-				return this.onInvalidWorkspaceConfigurationFileError();
+				this.onInvalidWorkspaceConfigurationFileError();
+				return TPromise.as(void 0);
 			case JSONEditingErrorCode.ERROR_FILE_DIRTY:
-				return this.onWorkspaceConfigurationFileDirtyError();
+				this.onWorkspaceConfigurationFileDirtyError();
+				return TPromise.as(void 0);
 		}
 		this.notificationService.error(error.message);
 		return TPromise.as(void 0);
 	}
 
-	private onInvalidWorkspaceConfigurationFileError(): TPromise<void> {
+	private onInvalidWorkspaceConfigurationFileError(): void {
 		const message = nls.localize('errorInvalidTaskConfiguration', "Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again.");
-		return this.askToOpenWorkspaceConfigurationFile(message);
+		this.askToOpenWorkspaceConfigurationFile(message);
 	}
 
-	private onWorkspaceConfigurationFileDirtyError(): TPromise<void> {
+	private onWorkspaceConfigurationFileDirtyError(): void {
 		const message = nls.localize('errorWorkspaceConfigurationFileDirty', "Unable to write into workspace configuration file because the file is dirty. Please save it and try again.");
-		return this.askToOpenWorkspaceConfigurationFile(message);
+		this.askToOpenWorkspaceConfigurationFile(message);
 	}
 
-	private askToOpenWorkspaceConfigurationFile(message: string): TPromise<void> {
-		return this.notificationService.prompt(Severity.Error, message, [nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration")])
-			.then(option => {
-				if (option === 0) {
-					this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile');
-				}
-			});
+	private askToOpenWorkspaceConfigurationFile(message: string): void {
+		this.notificationService.prompt(Severity.Error, message,
+			[{
+				label: nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration"),
+				run: () => this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile')
+			}]
+		);
 	}
 
 	private doEnterWorkspace(mainSidePromise: () => TPromise<IEnterWorkspaceResult>): TPromise<void> {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
index a7711e888f6..feeab0b2895 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import { MainThreadMessageService } from 'vs/workbench/api/electron-browser/mainThreadMessageService';
 import { TPromise as Promise, TPromise } from 'vs/base/common/winjs.base';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, INotification, NoOpNotification, INotificationHandle, PromptOption, Severity } from 'vs/platform/notification/common/notification';
+import { INotificationService, INotification, NoOpNotification, INotificationHandle, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 
 const emptyDialogService = new class implements IDialogService {
@@ -45,7 +45,7 @@ const emptyNotificationService = new class implements INotificationService {
 	error(...args: any[]): never {
 		throw new Error('not implemented');
 	}
-	prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
 		throw new Error('not implemented');
 	}
 };
@@ -71,8 +71,8 @@ class EmptyNotificationService implements INotificationService {
 	error(message: any): void {
 		throw new Error('Method not implemented.');
 	}
-	prompt(severity: Severity, message: string, choices: PromptOption[]): Promise<number, any> {
-		throw new Error('Method not implemented.');
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+		throw new Error('not implemented');
 	}
 }
 
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 220a4d8e75a..7fb344f6341 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -63,7 +63,7 @@ import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKe
 import { ITextBufferFactory, DefaultEndOfLine, EndOfLinePreference } from 'vs/editor/common/model';
 import { Range } from 'vs/editor/common/core/range';
 import { IConfirmation, IConfirmationResult, IDialogService, IDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, INotificationHandle, INotification, NoOpNotification, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService, INotificationHandle, INotification, NoOpNotification, IPromptChoice } from 'vs/platform/notification/common/notification';
 
 export function createFileInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, void 0);
@@ -328,8 +328,8 @@ export class TestNotificationService implements INotificationService {
 		return TestNotificationService.NO_OP;
 	}
 
-	public prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
-		return TPromise.as(0);
+	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+		return TestNotificationService.NO_OP;
 	}
 }
 

From 9a273dfc845455315c7a78f1ffaa954c1cd52cd1 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 4 Apr 2018 07:54:58 +0200
Subject: [PATCH 312/383] :lipstick:

---
 .../electron-browser/task.contribution.ts     | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

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 03a0b389ef4..9dae269eac1 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -17,7 +17,7 @@ import { IStringDictionary } from 'vs/base/common/collections';
 import { Action } from 'vs/base/common/actions';
 import * as Dom from 'vs/base/browser/dom';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Event, Emitter, once } from 'vs/base/common/event';
+import { Event, Emitter } from 'vs/base/common/event';
 import * as Builder from 'vs/base/browser/builder';
 import * as Types from 'vs/base/common/types';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
@@ -1621,15 +1621,6 @@ class TaskService implements ITaskService {
 		};
 	}
 
-	private configureBuildTask(): Action {
-		let run = () => { this.runConfigureTasks(); return TPromise.as(undefined); };
-		return new class extends Action {
-			constructor() {
-				super(ConfigureTaskAction.ID, ConfigureTaskAction.TEXT, undefined, true, run);
-			}
-		};
-	}
-
 	public beforeShutdown(): boolean | TPromise<boolean> {
 		if (!this._taskSystem) {
 			return false;
@@ -1689,15 +1680,6 @@ class TaskService implements ITaskService {
 		});
 	}
 
-	private getConfigureAction(code: TaskErrors): Action {
-		switch (code) {
-			case TaskErrors.NoBuildTask:
-				return this.configureBuildTask();
-			default:
-				return this.configureAction();
-		}
-	}
-
 	private handleError(err: any): void {
 		let showOutput = true;
 		if (err instanceof TaskError) {
@@ -1705,14 +1687,16 @@ class TaskService implements ITaskService {
 			let needsConfig = buildError.code === TaskErrors.NotConfigured || buildError.code === TaskErrors.NoBuildTask || buildError.code === TaskErrors.NoTestTask;
 			let needsTerminate = buildError.code === TaskErrors.RunningTask;
 			if (needsConfig || needsTerminate) {
-				let action: Action = needsConfig
-					? this.getConfigureAction(buildError.code)
-					: new Action(
-						'workbench.action.tasks.terminate',
-						nls.localize('TerminateAction.label', "Terminate Task"),
-						undefined, true, () => { this.runTerminateCommand(); return TPromise.wrap<void>(undefined); });
-				let handle = this.notificationService.notify({ severity: buildError.severity, message: buildError.message, actions: { primary: [action] } });
-				once(handle.onDidDispose)(() => action.dispose());
+				this.notificationService.prompt(buildError.severity, buildError.message, [{
+					label: needsConfig ? ConfigureTaskAction.TEXT : nls.localize('TerminateAction.label', "Terminate Task"),
+					run: () => {
+						if (needsConfig) {
+							this.runConfigureTasks();
+						} else {
+							this.runTerminateCommand();
+						}
+					}
+				}]);
 			} else {
 				this.notificationService.notify({ severity: buildError.severity, message: buildError.message });
 			}

From b393ca69ac3551814ac7fd0804c0cb386658d215 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 4 Apr 2018 10:08:57 +0200
Subject: [PATCH 313/383] debt - further reduce Builder usage

---
 src/vs/base/browser/builder.css               |  8 +--
 src/vs/base/browser/dom.ts                    | 32 +++++++++
 src/vs/base/test/browser/builder.test.ts      |  1 -
 src/vs/workbench/browser/composite.ts         |  9 ++-
 src/vs/workbench/browser/layout.ts            | 68 +++++++++----------
 src/vs/workbench/browser/panel.ts             |  2 +-
 src/vs/workbench/browser/part.ts              | 25 ++++---
 .../parts/activitybar/activitybarPart.ts      |  8 +--
 .../workbench/browser/parts/compositePart.ts  | 14 ++--
 .../browser/parts/editor/baseEditor.ts        | 11 ++-
 .../browser/parts/editor/binaryEditor.ts      |  6 +-
 .../parts/editor/editorGroupsControl.ts       | 42 ++++++------
 .../browser/parts/editor/editorPart.ts        | 30 ++++----
 .../browser/parts/editor/resourceViewer.ts    | 12 ++--
 .../browser/parts/editor/sideBySideEditor.ts  | 14 ++--
 .../browser/parts/editor/textDiffEditor.ts    |  5 +-
 .../browser/parts/editor/textEditor.ts        | 11 ++-
 .../browser/parts/panel/panelPart.ts          | 10 +--
 .../browser/parts/sidebar/sidebarPart.ts      |  3 +-
 .../browser/parts/statusbar/statusbarPart.ts  | 16 ++---
 .../browser/parts/titlebar/titlebarPart.ts    | 13 ++--
 .../browser/parts/views/customView.ts         |  5 +-
 .../browser/parts/views/panelViewlet.ts       | 10 ++-
 .../browser/parts/views/viewsViewlet.ts       |  9 ++-
 src/vs/workbench/browser/viewlet.ts           |  2 +-
 .../workbench/electron-browser/workbench.ts   | 33 ++++-----
 .../parts/debug/browser/debugActionsWidget.ts |  7 +-
 .../parts/debug/browser/debugViewlet.ts       |  6 +-
 .../parts/debug/electron-browser/repl.ts      |  5 +-
 .../electron-browser/extensionEditor.ts       |  7 +-
 .../electron-browser/extensionsViewlet.ts     |  9 ++-
 .../runtimeExtensionsEditor.ts                |  9 +--
 .../files/electron-browser/explorerViewlet.ts |  6 +-
 .../electron-browser/views/explorerView.ts    |  7 +-
 .../html/electron-browser/htmlPreviewPart.ts  |  5 +-
 .../markers/electron-browser/markersPanel.ts  |  7 +-
 .../parts/output/browser/outputPanel.ts       |  5 +-
 .../preferences/browser/keybindingsEditor.ts  |  9 +--
 .../preferences/browser/preferencesEditor.ts  | 18 +++--
 .../parts/scm/electron-browser/scmViewlet.ts  |  7 +-
 .../parts/search/browser/searchActions.ts     |  2 +-
 .../parts/search/browser/searchView.ts        |  8 +--
 .../electron-browser/task.contribution.ts     | 29 ++++----
 .../electron-browser/terminalPanel.ts         |  7 +-
 .../webview/electron-browser/webviewEditor.ts |  7 +-
 .../electron-browser/walkThroughPart.ts       | 13 ++--
 src/vs/workbench/test/browser/part.test.ts    | 41 ++++++-----
 47 files changed, 300 insertions(+), 313 deletions(-)

diff --git a/src/vs/base/browser/builder.css b/src/vs/base/browser/builder.css
index 09e124826a6..e440d5cf994 100644
--- a/src/vs/base/browser/builder.css
+++ b/src/vs/base/browser/builder.css
@@ -5,10 +5,4 @@
 
 .monaco-builder-hidden {
 	display: none !important;
-	visibility: hidden !important;
-}
-
-.monaco-builder-visible {
-	display: inherit;
-	visibility: visible;
-}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 75248d70562..55b001b91b4 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -590,6 +590,36 @@ export interface IDomNodePagePosition {
 	height: number;
 }
 
+export function size(element: HTMLElement, width: number, height: number): void {
+	if (typeof width === 'number') {
+		element.style.width = `${width}px`;
+	}
+
+	if (typeof height === 'number') {
+		element.style.height = `${height}px`;
+	}
+}
+
+export function position(element: HTMLElement, top: number, right?: number, bottom?: number, left?: number, position: string = 'absolute'): void {
+	if (typeof top === 'number') {
+		element.style.top = `${top}px`;
+	}
+
+	if (typeof right === 'number') {
+		element.style.right = `${right}px`;
+	}
+
+	if (typeof bottom === 'number') {
+		element.style.bottom = `${bottom}px`;
+	}
+
+	if (typeof left === 'number') {
+		element.style.left = `${left}px`;
+	}
+
+	element.style.position = position;
+}
+
 /**
  * Returns the position of a dom node relative to the entire page.
  */
@@ -994,12 +1024,14 @@ export function join(nodes: Node[], separator: Node | string): Node[] {
 export function show(...elements: HTMLElement[]): void {
 	for (let element of elements) {
 		element.style.display = '';
+		element.removeAttribute('aria-hidden');
 	}
 }
 
 export function hide(...elements: HTMLElement[]): void {
 	for (let element of elements) {
 		element.style.display = 'none';
+		element.setAttribute('aria-hidden', 'true');
 	}
 }
 
diff --git a/src/vs/base/test/browser/builder.test.ts b/src/vs/base/test/browser/builder.test.ts
index 9184eff6ac1..d46dff04c97 100644
--- a/src/vs/base/test/browser/builder.test.ts
+++ b/src/vs/base/test/browser/builder.test.ts
@@ -636,7 +636,6 @@ suite('Builder', () => {
 		assert(!b.isHidden());
 		b.hide();
 		assert(b.isHidden());
-		assert(!b.hasClass('monaco-builder-visible'));
 		b.show();
 		b.hide();
 		assert(b.hasClass('monaco-builder-hidden'));
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index e540070611e..04e72f4dfa8 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder } from 'vs/base/browser/builder';
 import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Component } from 'vs/workbench/common/component';
@@ -35,7 +34,7 @@ export abstract class Composite extends Component implements IComposite {
 	private _focusListenerDisposable?: IDisposable;
 
 	private visible: boolean;
-	private parent: Builder;
+	private parent: HTMLElement;
 
 	protected actionRunner: IActionRunner;
 
@@ -75,7 +74,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * Note that DOM-dependent calculations should be performed from the setVisible()
 	 * call. Only then the composite will be part of the DOM.
 	 */
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		this.parent = parent;
 
 		return TPromise.as(null);
@@ -88,12 +87,12 @@ export abstract class Composite extends Component implements IComposite {
 	/**
 	 * Returns the container this composite is being build in.
 	 */
-	public getContainer(): Builder {
+	public getContainer(): HTMLElement {
 		return this.parent;
 	}
 
 	public get onDidFocus(): Event<any> {
-		this._focusTracker = trackFocus(this.getContainer().getHTMLElement());
+		this._focusTracker = trackFocus(this.getContainer());
 		this._focusListenerDisposable = this._focusTracker.onDidFocus(() => {
 			this._onDidFocus.fire();
 		});
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 516f874935a..e8dcb1d830b 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -22,7 +22,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { memoize } from 'vs/base/common/decorators';
 import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
 import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
-import { Dimension, getClientArea } from 'vs/base/browser/dom';
+import { Dimension, getClientArea, size, position, hide, show } from 'vs/base/browser/dom';
 
 const MIN_SIDEBAR_PART_WIDTH = 170;
 const DEFAULT_SIDEBAR_PART_WIDTH = 300;
@@ -578,14 +578,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		}
 
 		// Workbench
-		this.workbenchContainer.style.top = '0px';
-		this.workbenchContainer.style.right = '0px';
-		this.workbenchContainer.style.bottom = '0px';
-		this.workbenchContainer.style.left = '0px';
-		this.workbenchContainer.style.position = 'relative';
-
-		this.workbenchContainer.style.width = `${this.workbenchSize.width}px`;
-		this.workbenchContainer.style.height = `${this.workbenchSize.height}px`;
+		position(this.workbenchContainer, 0, 0, 0, 0, 'relative');
+		size(this.workbenchContainer, this.workbenchSize.width, this.workbenchSize.height);
 
 		// Bug on Chrome: Sometimes Chrome wants to scroll the workbench container on layout changes. The fix is to reset scrolling in this case.
 		const workbenchContainer = this.workbenchContainer;
@@ -597,64 +591,70 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		}
 
 		// Title Part
+		const titleContainer = this.titlebar.getContainer();
 		if (isTitlebarHidden) {
-			this.titlebar.getContainer().hide();
+			hide(titleContainer);
 		} else {
-			this.titlebar.getContainer().show();
+			show(titleContainer);
 		}
 
 		// Editor Part and Panel part
-		this.editor.getContainer().size(editorSize.width, editorSize.height);
-		this.panel.getContainer().size(panelDimension.width, panelDimension.height);
+		const editorContainer = this.editor.getContainer();
+		const panelContainer = this.panel.getContainer();
+		size(editorContainer, editorSize.width, editorSize.height);
+		size(panelContainer, panelDimension.width, panelDimension.height);
 
 		if (panelPosition === Position.BOTTOM) {
 			if (sidebarPosition === Position.LEFT) {
-				this.editor.getContainer().position(this.titlebarHeight, 0, this.statusbarHeight + panelDimension.height, sidebarSize.width + activityBarSize.width);
-				this.panel.getContainer().position(editorSize.height + this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
+				position(editorContainer, this.titlebarHeight, 0, this.statusbarHeight + panelDimension.height, sidebarSize.width + activityBarSize.width);
+				position(panelContainer, editorSize.height + this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
 			} else {
-				this.editor.getContainer().position(this.titlebarHeight, sidebarSize.width, this.statusbarHeight + panelDimension.height, 0);
-				this.panel.getContainer().position(editorSize.height + this.titlebarHeight, sidebarSize.width, this.statusbarHeight, 0);
+				position(editorContainer, this.titlebarHeight, sidebarSize.width, this.statusbarHeight + panelDimension.height, 0);
+				position(panelContainer, editorSize.height + this.titlebarHeight, sidebarSize.width, this.statusbarHeight, 0);
 			}
 		} else {
 			if (sidebarPosition === Position.LEFT) {
-				this.editor.getContainer().position(this.titlebarHeight, panelDimension.width, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
-				this.panel.getContainer().position(this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width + editorSize.width);
+				position(editorContainer, this.titlebarHeight, panelDimension.width, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
+				position(panelContainer, this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width + editorSize.width);
 			} else {
-				this.editor.getContainer().position(this.titlebarHeight, sidebarSize.width + activityBarSize.width + panelWidth, this.statusbarHeight, 0);
-				this.panel.getContainer().position(this.titlebarHeight, sidebarSize.width + activityBarSize.width, this.statusbarHeight, editorSize.width);
+				position(editorContainer, this.titlebarHeight, sidebarSize.width + activityBarSize.width + panelWidth, this.statusbarHeight, 0);
+				position(panelContainer, this.titlebarHeight, sidebarSize.width + activityBarSize.width, this.statusbarHeight, editorSize.width);
 			}
 		}
 
 		// Activity Bar Part
-		this.activitybar.getContainer().size(null, activityBarSize.height);
+		const activitybarContainer = this.activitybar.getContainer();
+		size(activitybarContainer, null, activityBarSize.height);
 		if (sidebarPosition === Position.LEFT) {
-			this.activitybar.getContainer().getHTMLElement().style.right = '';
-			this.activitybar.getContainer().position(this.titlebarHeight, null, 0, 0);
+			this.activitybar.getContainer().style.right = '';
+			position(activitybarContainer, this.titlebarHeight, null, 0, 0);
 		} else {
-			this.activitybar.getContainer().getHTMLElement().style.left = '';
-			this.activitybar.getContainer().position(this.titlebarHeight, 0, 0, null);
+			this.activitybar.getContainer().style.left = '';
+			position(activitybarContainer, this.titlebarHeight, 0, 0, null);
 		}
 		if (isActivityBarHidden) {
-			this.activitybar.getContainer().hide();
+			hide(activitybarContainer);
 		} else {
-			this.activitybar.getContainer().show();
+			show(activitybarContainer);
 		}
 
 		// Sidebar Part
-		this.sidebar.getContainer().size(sidebarSize.width, sidebarSize.height);
+		const sidebarContainer = this.sidebar.getContainer();
+		size(sidebarContainer, sidebarSize.width, sidebarSize.height);
 		const editorAndPanelWidth = editorSize.width + (panelPosition === Position.RIGHT ? panelWidth : 0);
 		if (sidebarPosition === Position.LEFT) {
-			this.sidebar.getContainer().position(this.titlebarHeight, editorAndPanelWidth, this.statusbarHeight, activityBarSize.width);
+			position(sidebarContainer, this.titlebarHeight, editorAndPanelWidth, this.statusbarHeight, activityBarSize.width);
 		} else {
-			this.sidebar.getContainer().position(this.titlebarHeight, activityBarSize.width, this.statusbarHeight, editorAndPanelWidth);
+			position(sidebarContainer, this.titlebarHeight, activityBarSize.width, this.statusbarHeight, editorAndPanelWidth);
 		}
 
 		// Statusbar Part
-		this.statusbar.getContainer().position(this.workbenchSize.height - this.statusbarHeight);
+		const statusbarContainer = this.statusbar.getContainer();
+		position(statusbarContainer, this.workbenchSize.height - this.statusbarHeight);
 		if (isStatusbarHidden) {
-			this.statusbar.getContainer().hide();
+			hide(statusbarContainer);
 		} else {
-			this.statusbar.getContainer().show();
+			show(statusbarContainer);
 		}
 
 		// Quick open
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
index a44f1f6c2e2..8b05f420b0b 100644
--- a/src/vs/workbench/browser/panel.ts
+++ b/src/vs/workbench/browser/panel.ts
@@ -95,7 +95,7 @@ export abstract class TogglePanelAction extends Action {
 		const activePanel = this.panelService.getActivePanel();
 		const activeElement = document.activeElement;
 
-		return activePanel && activeElement && DOM.isAncestor(activeElement, (<Panel>activePanel).getContainer().getHTMLElement());
+		return activePanel && activeElement && DOM.isAncestor(activeElement, (<Panel>activePanel).getContainer());
 	}
 }
 
diff --git a/src/vs/workbench/browser/part.ts b/src/vs/workbench/browser/part.ts
index 2fa675fe4c7..8f147ff99bc 100644
--- a/src/vs/workbench/browser/part.ts
+++ b/src/vs/workbench/browser/part.ts
@@ -6,10 +6,9 @@
 'use strict';
 
 import 'vs/css!./media/part';
-import { Builder } from 'vs/base/browser/builder';
 import { Component } from 'vs/workbench/common/component';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
-import { Dimension } from 'vs/base/browser/dom';
+import { Dimension, size } from 'vs/base/browser/dom';
 
 export interface IPartOptions {
 	hasTitle?: boolean;
@@ -21,9 +20,9 @@ export interface IPartOptions {
  * and mandatory content area to show content.
  */
 export abstract class Part extends Component {
-	private parent: Builder;
-	private titleArea: Builder;
-	private contentArea: Builder;
+	private parent: HTMLElement;
+	private titleArea: HTMLElement;
+	private contentArea: HTMLElement;
 	private partLayout: PartLayout;
 
 	constructor(
@@ -48,7 +47,7 @@ export abstract class Part extends Component {
 	 *
 	 * Called to create title and content area of the part.
 	 */
-	public create(parent: Builder): void {
+	public create(parent: HTMLElement): void {
 		this.parent = parent;
 		this.titleArea = this.createTitleArea(parent);
 		this.contentArea = this.createContentArea(parent);
@@ -61,35 +60,35 @@ export abstract class Part extends Component {
 	/**
 	 * Returns the overall part container.
 	 */
-	public getContainer(): Builder {
+	public getContainer(): HTMLElement {
 		return this.parent;
 	}
 
 	/**
 	 * Subclasses override to provide a title area implementation.
 	 */
-	protected createTitleArea(parent: Builder): Builder {
+	protected createTitleArea(parent: HTMLElement): HTMLElement {
 		return null;
 	}
 
 	/**
 	 * Returns the title area container.
 	 */
-	protected getTitleArea(): Builder {
+	protected getTitleArea(): HTMLElement {
 		return this.titleArea;
 	}
 
 	/**
 	 * Subclasses override to provide a content area implementation.
 	 */
-	protected createContentArea(parent: Builder): Builder {
+	protected createContentArea(parent: HTMLElement): HTMLElement {
 		return null;
 	}
 
 	/**
 	 * Returns the content area container.
 	 */
-	protected getContentArea(): Builder {
+	protected getContentArea(): HTMLElement {
 		return this.contentArea;
 	}
 
@@ -105,7 +104,7 @@ const TITLE_HEIGHT = 35;
 
 export class PartLayout {
 
-	constructor(container: Builder, private options: IPartOptions, titleArea: Builder, private contentArea: Builder) { }
+	constructor(container: HTMLElement, private options: IPartOptions, titleArea: HTMLElement, private contentArea: HTMLElement) { }
 
 	public layout(dimension: Dimension): Dimension[] {
 		const { width, height } = dimension;
@@ -133,7 +132,7 @@ export class PartLayout {
 
 		// Content
 		if (this.contentArea) {
-			this.contentArea.size(contentSize.width, contentSize.height);
+			size(this.contentArea, contentSize.width, contentSize.height);
 		}
 
 		return sizes;
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index db68639288e..298b44a0160 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -9,7 +9,7 @@ import 'vs/css!./media/activitybarpart';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { illegalArgument } from 'vs/base/common/errors';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import { Action } from 'vs/base/common/actions';
 import { ActionsOrientation, ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { GlobalActivityExtensions, IGlobalActivityRegistry } from 'vs/workbench/common/activity';
@@ -125,7 +125,7 @@ export class ActivitybarPart extends Part {
 		return toDisposable(() => action.setBadge(undefined));
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		const $el = $(parent);
 		const $result = $('.content').appendTo($el);
 
@@ -156,14 +156,14 @@ export class ActivitybarPart extends Part {
 			});
 		}
 
-		return $result;
+		return $result.getHTMLElement();
 	}
 
 	public updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 		const background = this.getColor(ACTIVITY_BAR_BACKGROUND);
 		container.style('background-color', background);
 
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index da608b7abb9..e9b89555eea 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -224,7 +224,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 				'class': ['composite', this.compositeCSSClass],
 				id: composite.getId()
 			}, div => {
-				createCompositePromise = composite.create(div).then(() => {
+				createCompositePromise = composite.create(div.getHTMLElement()).then(() => {
 					composite.updateStyles();
 				});
 			});
@@ -401,7 +401,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		});
 	}
 
-	public createTitleArea(parent: Builder): Builder {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
 
 		// Title Area Container
 		const titleArea = $(parent).div({
@@ -411,7 +411,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		$(titleArea).on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)));
 
 		// Left Title Label
-		this.titleLabel = this.createTitleLabel(titleArea);
+		this.titleLabel = this.createTitleLabel(titleArea.getHTMLElement());
 
 		// Right Actions Container
 		$(titleArea).div({
@@ -426,10 +426,10 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			});
 		});
 
-		return titleArea;
+		return titleArea.getHTMLElement();
 	}
 
-	protected createTitleLabel(parent: Builder): ICompositeTitleLabel {
+	protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel {
 		let titleLabel: Builder;
 		$(parent).div({
 			'class': 'title-label'
@@ -486,14 +486,14 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return undefined;
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		return $(parent).div({
 			'class': 'content'
 		}, div => {
 			this.progressBar = new ProgressBar(div.getHTMLElement());
 			this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
 			this.progressBar.hide();
-		});
+		}).getHTMLElement();
 	}
 
 	private onError(error: any): void {
diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts
index b38ca7a0638..e7809135889 100644
--- a/src/vs/workbench/browser/parts/editor/baseEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder } from 'vs/base/browser/builder';
 import { Panel } from 'vs/workbench/browser/panel';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { IEditor, Position } from 'vs/platform/editor/common/editor';
@@ -64,9 +63,9 @@ export abstract class BaseEditor extends Panel implements IEditor {
 		this._options = null;
 	}
 
-	public create(parent: Builder): void; // create is sync for editors
-	public create(parent: Builder): TPromise<void>;
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): void; // create is sync for editors
+	public create(parent: HTMLElement): TPromise<void>;
+	public create(parent: HTMLElement): TPromise<void> {
 		const res = super.create(parent);
 
 		// Create Editor
@@ -76,9 +75,9 @@ export abstract class BaseEditor extends Panel implements IEditor {
 	}
 
 	/**
-	 * Called to create the editor in the parent builder.
+	 * Called to create the editor in the parent HTMLElement.
 	 */
-	protected abstract createEditor(parent: Builder): void;
+	protected abstract createEditor(parent: HTMLElement): void;
 
 	/**
 	 * Overload this function to allow for passing in a position argument.
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index e50946ef3ad..77d4fbf3b0c 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -60,7 +60,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		return this.input ? this.input.getName() : nls.localize('binaryEditor', "Binary Viewer");
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 
 		// Container for Binary
 		const binaryContainerElement = document.createElement('div');
@@ -71,7 +71,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 		// Custom Scrollbars
 		this.scrollbar = new DomScrollableElement(binaryContainerElement, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto });
-		parent.getHTMLElement().appendChild(this.scrollbar.getDomNode());
+		parent.appendChild(this.scrollbar.getDomNode());
 	}
 
 	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
@@ -99,7 +99,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 				// Render Input
 				this.resourceViewerContext = ResourceViewer.show(
 					{ name: model.getName(), resource: model.getResource(), size: model.getSize(), etag: model.getETag(), mime: model.getMime() },
-					this.binaryContainer,
+					this.binaryContainer.getHTMLElement(),
 					this.scrollbar,
 					resource => this.callbacks.openInternal(input, options),
 					resource => this.callbacks.openExternal(resource),
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
index 26779caaa6e..f578a8d5170 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -118,7 +118,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 	private stacks: IEditorStacksModel;
 
-	private parent: Builder;
+	private parent: HTMLElement;
 	private dimension: DOM.Dimension;
 	private dragging: boolean;
 
@@ -168,7 +168,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 	private transfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
 
 	constructor(
-		parent: Builder,
+		parent: HTMLElement,
 		groupOrientation: GroupOrientation,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
@@ -367,8 +367,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.trackFocus(editor, position);
 
 		// Find target container and build into
-		const target = this.silos[position].child();
-		editor.getContainer().build(target);
+		const target = this.silos[position].child().getHTMLElement();
+		target.appendChild(editor.getContainer());
 
 		// Adjust layout according to provided ratios (used when restoring multiple editors at once)
 		if (ratio && (ratio.length === 2 || ratio.length === 3)) {
@@ -440,7 +440,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		}
 
 		// Show editor container
-		editor.getContainer().show();
+		DOM.show(editor.getContainer());
 	}
 
 	private getVisibleEditorCount(): number {
@@ -552,7 +552,11 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.clearPosition(position);
 
 		// Take editor container offdom and hide
-		editor.getContainer().offDOM().hide();
+		const editorContainer = editor.getContainer();
+		if (editorContainer.parentNode) {
+			editorContainer.parentNode.removeChild(editorContainer);
+		}
+		DOM.hide(editorContainer);
 
 		// Adjust layout and rochade if instructed to do so
 		if (layoutAndRochade) {
@@ -778,10 +782,10 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.layoutVertically = (orientation !== 'horizontal');
 
 		// Editor Layout
-		const verticalLayouting = this.parent.hasClass('vertical-layout');
+		const verticalLayouting = DOM.hasClass(this.parent, 'vertical-layout');
 		if (verticalLayouting !== this.layoutVertically) {
-			this.parent.removeClass('vertical-layout', 'horizontal-layout');
-			this.parent.addClass(this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
+			DOM.removeClasses(this.parent, 'vertical-layout', 'horizontal-layout');
+			DOM.addClass(this.parent, this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
 
 			this.sashOne.setOrientation(this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL);
 			this.sashTwo.setOrientation(this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL);
@@ -966,16 +970,16 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 	private create(): void {
 
 		// Store layout as class property
-		this.parent.addClass(this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
+		DOM.addClass(this.parent, this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
 
 		// Allow to drop into container to open
-		this.enableDropTarget(this.parent.getHTMLElement());
+		this.enableDropTarget(this.parent);
 
 		// Silo One
 		this.silos[Position.ONE] = $(this.parent).div({ class: 'one-editor-silo editor-one' });
 
 		// Sash One
-		this.sashOne = new Sash(this.parent.getHTMLElement(), this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
+		this.sashOne = new Sash(this.parent, this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
 		this.toUnbind.push(this.sashOne.onDidStart(() => this.onSashOneDragStart()));
 		this.toUnbind.push(this.sashOne.onDidChange((e: ISashEvent) => this.onSashOneDrag(e)));
 		this.toUnbind.push(this.sashOne.onDidEnd(() => this.onSashOneDragEnd()));
@@ -986,7 +990,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.silos[Position.TWO] = $(this.parent).div({ class: 'one-editor-silo editor-two' });
 
 		// Sash Two
-		this.sashTwo = new Sash(this.parent.getHTMLElement(), this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
+		this.sashTwo = new Sash(this.parent, this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
 		this.toUnbind.push(this.sashTwo.onDidStart(() => this.onSashTwoDragStart()));
 		this.toUnbind.push(this.sashTwo.onDidChange((e: ISashEvent) => this.onSashTwoDrag(e)));
 		this.toUnbind.push(this.sashTwo.onDidEnd(() => this.onSashTwoDragEnd()));
@@ -1282,7 +1286,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 			if (!overlay) {
 				const containers = $this.visibleEditors.filter(e => !!e).map(e => e.getContainer());
 				containers.forEach((container, index) => {
-					if (container && DOM.isAncestor(target, container.getHTMLElement())) {
+					if (container && DOM.isAncestor(target, container)) {
 						const activeContrastBorderColor = $this.getColor(activeContrastBorder);
 						overlay = $('div').style({
 							top: $this.tabOptions.showTabs ? `${EditorGroupsControl.EDITOR_TITLE_HEIGHT}px` : 0,
@@ -1625,11 +1629,11 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 		let borderColor = null;
 		if (isDragging) {
-			this.parent.addClass('dragging');
+			DOM.addClass(this.parent, 'dragging');
 			silo.addClass('dragging');
 			borderColor = this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder);
 		} else {
-			this.parent.removeClass('dragging');
+			DOM.removeClass(this.parent, 'dragging');
 			silo.removeClass('dragging');
 		}
 
@@ -2201,9 +2205,9 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 			}
 
 			const editorContainer = editor.getContainer();
-			editorContainer.style('margin-left', this.centeredEditorActive ? `${editorPosition}px` : null);
-			editorContainer.style('width', this.centeredEditorActive ? `${editorWidth}px` : null);
-			editorContainer.style('border-color', this.centeredEditorActive ? this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder) : null);
+			editorContainer.style.marginLeft = this.centeredEditorActive ? `${editorPosition}px` : null;
+			editorContainer.style.width = this.centeredEditorActive ? `${editorWidth}px` : null;
+			editorContainer.style.borderColor = this.centeredEditorActive ? this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder) : null;
 			editor.layout(new DOM.Dimension(editorWidth, editorHeight));
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 97e25171b1a..246dc838d0e 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -9,7 +9,6 @@ import 'vs/css!./media/editorpart';
 import 'vs/workbench/browser/parts/editor/editor.contribution';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { Builder, $ } from 'vs/base/browser/builder';
 import * as nls from 'vs/nls';
 import * as strings from 'vs/base/common/strings';
 import * as arrays from 'vs/base/common/arrays';
@@ -40,7 +39,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { EDITOR_GROUP_BACKGROUND } from 'vs/workbench/common/theme';
-import { createCSSRule, Dimension } from 'vs/base/browser/dom';
+import { createCSSRule, Dimension, addClass, removeClass } from 'vs/base/browser/dom';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { join } from 'vs/base/common/paths';
 import { IEditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
@@ -470,11 +469,12 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Create editor as needed
 		if (!editor.getContainer()) {
-			editor.create($().div({
-				'class': 'editor-container',
-				'role': 'tabpanel',
-				id: descriptor.getId()
-			}));
+			const editorContainer = document.createElement('div');
+			editorContainer.id = descriptor.getId();
+			addClass(editorContainer, 'editor-container');
+			editorContainer.setAttribute('role', 'tabpanel');
+
+			editor.create(editorContainer);
 		}
 
 		return editor;
@@ -1134,12 +1134,12 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		return this.editorGroupsControl.getGroupOrientation();
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 
 		// Content Container
-		const contentArea = $(parent)
-			.div()
-			.addClass('content');
+		const contentArea = document.createElement('div');
+		addClass(contentArea, 'content');
+		parent.appendChild(contentArea);
 
 		// get settings
 		this.memento = this.getMemento(this.storageService, MementoScope.WORKSPACE);
@@ -1157,19 +1157,19 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Part container
 		const container = this.getContainer();
-		container.style('background-color', this.getColor(editorBackground));
+		container.style.backgroundColor = this.getColor(editorBackground);
 
 		// Content area
 		const content = this.getContentArea();
 
 		const groupCount = this.stacks.groups.length;
 		if (groupCount > 1) {
-			content.addClass('multiple-groups');
+			addClass(content, 'multiple-groups');
 		} else {
-			content.removeClass('multiple-groups');
+			removeClass(content, 'multiple-groups');
 		}
 
-		content.style('background-color', groupCount > 0 ? this.getColor(EDITOR_GROUP_BACKGROUND) : null);
+		content.style.backgroundColor = groupCount > 0 ? this.getColor(EDITOR_GROUP_BACKGROUND) : null;
 	}
 
 	private onGroupFocusChanged(): void {
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index 973506ff5c7..02e222d2456 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -132,7 +132,7 @@ export class ResourceViewer {
 
 	public static show(
 		descriptor: IResourceDescriptor,
-		container: Builder,
+		container: HTMLElement,
 		scrollbar: DomScrollableElement,
 		openInternalClb: (uri: URI) => void,
 		openExternalClb: (uri: URI) => void,
@@ -184,7 +184,7 @@ class ImageView {
 	private static readonly BASE64_MARKER = 'base64,';
 
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
 		openExternalClb: (uri: URI) => void,
@@ -221,7 +221,7 @@ class ImageView {
 
 class LargeImageView {
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		openExternalClb: (uri: URI) => void
 	) {
@@ -247,7 +247,7 @@ class LargeImageView {
 
 class FileTooLargeFileView {
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
 		metadataClb: (meta: string) => void
@@ -270,7 +270,7 @@ class FileTooLargeFileView {
 
 class FileSeemsBinaryFileView {
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
 		openInternalClb: (uri: URI) => void,
@@ -434,7 +434,7 @@ class InlineImageView {
 	private static readonly imageStateCache = new LRUCache<string, ImageState>(100);
 
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
 		metadataClb: (meta: string) => void
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index d2e082c1d86..ea554cb2cc4 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -5,7 +5,6 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
-import { Builder } from 'vs/base/browser/builder';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorInput, EditorOptions, SideBySideEditorInput } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -39,10 +38,9 @@ export class SideBySideEditor extends BaseEditor {
 		super(SideBySideEditor.ID, telemetryService, themeService);
 	}
 
-	protected createEditor(parent: Builder): void {
-		const parentElement = parent.getHTMLElement();
-		DOM.addClass(parentElement, 'side-by-side-editor');
-		this.createSash(parentElement);
+	protected createEditor(parent: HTMLElement): void {
+		DOM.addClass(parent, 'side-by-side-editor');
+		this.createSash(parent);
 	}
 
 	public setInput(newInput: SideBySideEditorInput, options?: EditorOptions): TPromise<void> {
@@ -135,7 +133,7 @@ export class SideBySideEditor extends BaseEditor {
 		const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(editorInput);
 
 		const editor = descriptor.instantiate(this.instantiationService);
-		editor.create(new Builder(container));
+		editor.create(container);
 		editor.setVisible(this.isVisible(), this.position);
 
 		return editor;
@@ -149,7 +147,7 @@ export class SideBySideEditor extends BaseEditor {
 	}
 
 	private createEditorContainers(): void {
-		const parentElement = this.getContainer().getHTMLElement();
+		const parentElement = this.getContainer();
 		this.detailsEditorContainer = DOM.append(parentElement, DOM.$('.details-editor-container'));
 		this.detailsEditorContainer.style.position = 'absolute';
 		this.masterEditorContainer = DOM.append(parentElement, DOM.$('.master-editor-container'));
@@ -191,7 +189,7 @@ export class SideBySideEditor extends BaseEditor {
 	}
 
 	private disposeEditors(): void {
-		const parentContainer = this.getContainer().getHTMLElement();
+		const parentContainer = this.getContainer();
 		if (this.detailsEditor) {
 			this.detailsEditor.dispose();
 			this.detailsEditor = null;
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 0046ce5ab25..169c1c9b94a 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -9,7 +9,6 @@ import 'vs/css!./media/textdiffeditor';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
-import { Builder } from 'vs/base/browser/builder';
 import { Action, IAction } from 'vs/base/common/actions';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import * as types from 'vs/base/common/types';
@@ -82,7 +81,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		return nls.localize('textDiffEditor', "Text Diff Editor");
 	}
 
-	public createEditorControl(parent: Builder, configuration: IEditorOptions): IDiffEditor {
+	public createEditorControl(parent: HTMLElement, configuration: IEditorOptions): IDiffEditor {
 
 		// Actions
 		this.nextDiffAction = new NavigateAction(this, true);
@@ -122,7 +121,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		// Create a special child of instantiator that will delegate all calls to openEditor() to the same diff editor if the input matches with the modified one
 		const diffEditorInstantiator = this.instantiationService.createChild(new ServiceCollection([IWorkbenchEditorService, delegatingEditorService]));
 
-		return diffEditorInstantiator.createInstance(DiffEditorWidget, parent.getHTMLElement(), configuration);
+		return diffEditorInstantiator.createInstance(DiffEditorWidget, parent, configuration);
 	}
 
 	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index afec6d1b42f..bb7aae0c4f6 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -8,7 +8,6 @@
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
-import { Builder } from 'vs/base/browser/builder';
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
@@ -43,7 +42,7 @@ export interface IEditorConfiguration {
  */
 export abstract class BaseTextEditor extends BaseEditor {
 	private editorControl: IEditor;
-	private _editorContainer: Builder;
+	private _editorContainer: HTMLElement;
 	private hasPendingConfigurationChange: boolean;
 	private lastAppliedEditorOptions: IEditorOptions;
 
@@ -123,7 +122,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 		return overrides;
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 
 		// Editor for Text
 		this._editorContainer = parent;
@@ -177,10 +176,10 @@ export abstract class BaseTextEditor extends BaseEditor {
 	 *
 	 * The passed in configuration object should be passed to the editor control when creating it.
 	 */
-	protected createEditorControl(parent: Builder, configuration: IEditorOptions): IEditor {
+	protected createEditorControl(parent: HTMLElement, configuration: IEditorOptions): IEditor {
 
 		// Use a getter for the instantiation service since some subclasses might use scoped instantiation services
-		return this.instantiationService.createInstance(CodeEditor, parent.getHTMLElement(), configuration);
+		return this.instantiationService.createInstance(CodeEditor, parent, configuration);
 	}
 
 	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
@@ -189,7 +188,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 			// Update editor options after having set the input. We do this because there can be
 			// editor input specific options (e.g. an ARIA label depending on the input showing)
 			this.updateEditorConfiguration();
-			this._editorContainer.getHTMLElement().setAttribute('aria-label', this.computeAriaLabel());
+			this._editorContainer.setAttribute('aria-label', this.computeAriaLabel());
 		});
 	}
 
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 90d74fd857f..852757046ca 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/panelpart';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
-import { Builder } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IPanel } from 'vs/workbench/common/panel';
@@ -124,11 +124,11 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 	public updateStyles(): void {
 		super.updateStyles();
 
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 		container.style('background-color', this.getColor(PANEL_BACKGROUND));
 		container.style('border-left-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder));
 
-		const title = this.getTitleArea();
+		const title = $(this.getTitleArea());
 		title.style('border-top-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder));
 	}
 
@@ -208,8 +208,8 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return this.hideActiveComposite().then(composite => void 0);
 	}
 
-	protected createTitleLabel(parent: Builder): ICompositeTitleLabel {
-		const titleArea = this.compositeBar.create(parent.getHTMLElement());
+	protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel {
+		const titleArea = this.compositeBar.create(parent);
 		titleArea.classList.add('panel-switcher-container');
 
 		return {
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index 4ee3bbdd603..172dfe24ff2 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -27,6 +27,7 @@ import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER } from 'vs/workbench/common/theme';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Dimension } from 'vs/base/browser/dom';
+import { $ } from 'vs/base/browser/builder';
 
 export class SidebarPart extends CompositePart<Viewlet> {
 
@@ -79,7 +80,7 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		super.updateStyles();
 
 		// Part container
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 
 		container.style('background-color', this.getColor(SIDE_BAR_BACKGROUND));
 		container.style('color', this.getColor(SIDE_BAR_FOREGROUND));
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 1004fac2c9b..73592ff0f2b 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -10,7 +10,7 @@ import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -39,7 +39,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	private static readonly PRIORITY_PROP = 'priority';
 	private static readonly ALIGNMENT_PROP = 'alignment';
 
-	private statusItemsContainer: Builder;
+	private statusItemsContainer: HTMLElement;
 	private statusMsgDispose: IDisposable;
 
 	private styleElement: HTMLStyleElement;
@@ -67,7 +67,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		const toDispose = item.render(el);
 
 		// Insert according to priority
-		const container = this.statusItemsContainer.getHTMLElement();
+		const container = this.statusItemsContainer;
 		const neighbours = this.getEntries(alignment);
 		let inserted = false;
 		for (let i = 0; i < neighbours.length; i++) {
@@ -101,7 +101,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	private getEntries(alignment: StatusbarAlignment): HTMLElement[] {
 		const entries: HTMLElement[] = [];
 
-		const container = this.statusItemsContainer.getHTMLElement();
+		const container = this.statusItemsContainer;
 		const children = container.children;
 		for (let i = 0; i < children.length; i++) {
 			const childElement = <HTMLElement>children.item(i);
@@ -113,8 +113,8 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		return entries;
 	}
 
-	public createContentArea(parent: Builder): Builder {
-		this.statusItemsContainer = $(parent);
+	public createContentArea(parent: HTMLElement): HTMLElement {
+		this.statusItemsContainer = parent;
 
 		// Fill in initial items that were contributed from the registry
 		const registry = Registry.as<IStatusbarRegistry>(Extensions.Statusbar);
@@ -129,7 +129,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 			const el = this.doCreateStatusItem(descriptor.alignment, descriptor.priority);
 
 			const dispose = item.render(el);
-			this.statusItemsContainer.append(el);
+			this.statusItemsContainer.appendChild(el);
 
 			return dispose;
 		}));
@@ -140,7 +140,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	protected updateStyles(): void {
 		super.updateStyles();
 
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 
 		// Background colors
 		const backgroundColor = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BACKGROUND : STATUS_BAR_NO_FOLDER_BACKGROUND);
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index cef65a843f3..4fe96407a85 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -226,7 +226,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		});
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		this.titleContainer = $(parent);
 
 		// Title
@@ -262,20 +262,19 @@ export class TitlebarPart extends Part implements ITitleService {
 			}, 0 /* need a timeout because we are in capture phase */);
 		}, void 0, true /* use capture to know the currently active element properly */);
 
-		return this.titleContainer;
+		return this.titleContainer.getHTMLElement();
 	}
 
 	protected updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
-		const container = this.getContainer();
-		if (container) {
-			container.style('color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_FOREGROUND : TITLE_BAR_ACTIVE_FOREGROUND));
-			container.style('background-color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_BACKGROUND : TITLE_BAR_ACTIVE_BACKGROUND));
+		if (this.titleContainer) {
+			this.titleContainer.style('color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_FOREGROUND : TITLE_BAR_ACTIVE_FOREGROUND));
+			this.titleContainer.style('background-color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_BACKGROUND : TITLE_BAR_ACTIVE_BACKGROUND));
 
 			const titleBorder = this.getColor(TITLE_BAR_BORDER);
-			container.style('border-bottom', titleBorder ? `1px solid ${titleBorder}` : null);
+			this.titleContainer.style('border-bottom', titleBorder ? `1px solid ${titleBorder}` : null);
 		}
 	}
 
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index 0399b1e7df4..c064cc0bccd 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -9,7 +9,6 @@ import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
 import { LIGHT, FileThemeIcon, FolderThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ITree, IDataSource, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
 import { TreeItemCollapsibleState, ITreeItem, ITreeViewer, ICustomViewsService, ITreeViewDataProvider, ViewsRegistry, IViewDescriptor, TreeViewItemHandleArg, ICustomViewDescriptor, IViewsViewlet } from 'vs/workbench/common/views';
@@ -171,9 +170,9 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 
 		if (this.tree) {
 			if (this.isVisible) {
-				$(this.tree.getHTMLElement()).show();
+				DOM.show(this.tree.getHTMLElement());
 			} else {
-				$(this.tree.getHTMLElement()).hide(); // make sure the tree goes out of the tabindex world by hiding it
+				DOM.hide(this.tree.getHTMLElement()); // make sure the tree goes out of the tabindex world by hiding it
 			}
 
 			if (this.isVisible) {
diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts
index 28f0881979c..0fe47e54d6b 100644
--- a/src/vs/workbench/browser/parts/views/panelViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts
@@ -10,8 +10,7 @@ import { Event, Emitter, filterEvent } from 'vs/base/common/event';
 import { ColorIdentifier, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { attachStyler, IColorMapping } from 'vs/platform/theme/common/styler';
 import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND } from 'vs/workbench/common/theme';
-import { Builder } from 'vs/base/browser/builder';
-import { append, $, trackFocus, toggleClass, EventType, isAncestor, Dimension } from 'vs/base/browser/dom';
+import { append, $, trackFocus, toggleClass, EventType, isAncestor, Dimension, addDisposableListener } from 'vs/base/browser/dom';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { firstIndex } from 'vs/base/common/arrays';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
@@ -166,13 +165,12 @@ export class PanelViewlet extends Viewlet {
 		super(id, partService, telemetryService, themeService);
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
-		const container = parent.getHTMLElement();
-		this.panelview = this._register(new PanelView(container, this.options));
+		this.panelview = this._register(new PanelView(parent, this.options));
 		this._register(this.panelview.onDidDrop(({ from, to }) => this.movePanel(from as ViewletPanel, to as ViewletPanel)));
-		this._register(parent.on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
+		this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
 	}
 
 	private showContextMenu(event: StandardMouseEvent): void {
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index a9790f253c6..dbc78516337 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -6,7 +6,6 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import * as DOM from 'vs/base/browser/dom';
-import { $, Builder } from 'vs/base/browser/builder';
 import { Scope } from 'vs/workbench/common/memento';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
@@ -137,9 +136,9 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel {
 		}
 
 		if (isVisible) {
-			$(tree.getHTMLElement()).show();
+			DOM.show(tree.getHTMLElement());
 		} else {
-			$(tree.getHTMLElement()).hide(); // make sure the tree goes out of the tabindex world by hiding it
+			DOM.hide(tree.getHTMLElement()); // make sure the tree goes out of the tabindex world by hiding it
 		}
 
 		if (isVisible) {
@@ -215,7 +214,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 		this.viewletSettings = this.getMemento(storageService, Scope.WORKSPACE);
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
 		this._register(this.onDidSashChange(() => this.snapshotViewsStates()));
@@ -644,7 +643,7 @@ export class PersistentViewsViewlet extends ViewsViewlet {
 		this._register(this.onDidChangeViewVisibilityState(id => this.onViewVisibilityChanged(id)));
 	}
 
-	create(parent: Builder): TPromise<void> {
+	create(parent: HTMLElement): TPromise<void> {
 		this.loadViewsStates();
 		return super.create(parent);
 	}
diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts
index 1d5419d0e5e..e6ed31632fe 100644
--- a/src/vs/workbench/browser/viewlet.ts
+++ b/src/vs/workbench/browser/viewlet.ts
@@ -154,7 +154,7 @@ export class ToggleViewletAction extends Action {
 		const activeViewlet = this.viewletService.getActiveViewlet();
 		const activeElement = document.activeElement;
 
-		return activeViewlet && activeElement && DOM.isAncestor(activeElement, (<Viewlet>activeViewlet).getContainer().getHTMLElement());
+		return activeViewlet && activeElement && DOM.isAncestor(activeElement, (<Viewlet>activeViewlet).getContainer());
 	}
 }
 
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index e2a5c184d8d..e4e9cc79e7f 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -721,7 +721,7 @@ export class Workbench implements IPartService {
 	}
 
 	public getContainer(part: Parts): HTMLElement {
-		let container: Builder = null;
+		let container: HTMLElement = null;
 		switch (part) {
 			case Parts.TITLEBAR_PART:
 				container = this.titlebarPart.getContainer();
@@ -742,7 +742,8 @@ export class Workbench implements IPartService {
 				container = this.statusbarPart.getContainer();
 				break;
 		}
-		return container && container.getHTMLElement();
+
+		return container;
 	}
 
 	public isVisible(part: Parts): boolean {
@@ -942,10 +943,10 @@ export class Workbench implements IPartService {
 		this.sideBarPosition = position;
 
 		// Adjust CSS
-		this.activitybarPart.getContainer().removeClass(oldPositionValue);
-		this.sidebarPart.getContainer().removeClass(oldPositionValue);
-		this.activitybarPart.getContainer().addClass(newPositionValue);
-		this.sidebarPart.getContainer().addClass(newPositionValue);
+		DOM.removeClass(this.activitybarPart.getContainer(), oldPositionValue);
+		DOM.removeClass(this.sidebarPart.getContainer(), oldPositionValue);
+		DOM.addClass(this.activitybarPart.getContainer(), newPositionValue);
+		DOM.addClass(this.sidebarPart.getContainer(), newPositionValue);
 
 		// Update Styles
 		this.activitybarPart.updateStyles();
@@ -967,8 +968,8 @@ export class Workbench implements IPartService {
 			this.storageService.store(Workbench.panelPositionStorageKey, Position[this.panelPosition].toLowerCase(), StorageScope.WORKSPACE);
 
 			// Adjust CSS
-			this.panelPart.getContainer().removeClass(oldPositionValue);
-			this.panelPart.getContainer().addClass(newPositionValue);
+			DOM.removeClass(this.panelPart.getContainer(), oldPositionValue);
+			DOM.addClass(this.panelPart.getContainer(), newPositionValue);
 
 			// Update Styles
 			this.panelPart.updateStyles();
@@ -1108,10 +1109,10 @@ export class Workbench implements IPartService {
 		const editorContainer = this.editorPart.getContainer();
 		if (visibleEditors === 0) {
 			this.editorsVisibleContext.reset();
-			this.editorBackgroundDelayer.trigger(() => editorContainer.addClass('empty'));
+			this.editorBackgroundDelayer.trigger(() => DOM.addClass(editorContainer, 'empty'));
 		} else {
 			this.editorsVisibleContext.set(true);
-			this.editorBackgroundDelayer.trigger(() => editorContainer.removeClass('empty'));
+			this.editorBackgroundDelayer.trigger(() => DOM.removeClass(editorContainer, 'empty'));
 		}
 	}
 
@@ -1218,7 +1219,7 @@ export class Workbench implements IPartService {
 			role: 'contentinfo'
 		});
 
-		this.titlebarPart.create(titlebarContainer);
+		this.titlebarPart.create(titlebarContainer.getHTMLElement());
 	}
 
 	private createActivityBarPart(): void {
@@ -1229,7 +1230,7 @@ export class Workbench implements IPartService {
 				role: 'navigation'
 			});
 
-		this.activitybarPart.create(activitybarPartContainer);
+		this.activitybarPart.create(activitybarPartContainer.getHTMLElement());
 	}
 
 	private createSidebarPart(): void {
@@ -1240,7 +1241,7 @@ export class Workbench implements IPartService {
 				role: 'complementary'
 			});
 
-		this.sidebarPart.create(sidebarPartContainer);
+		this.sidebarPart.create(sidebarPartContainer.getHTMLElement());
 	}
 
 	private createPanelPart(): void {
@@ -1251,7 +1252,7 @@ export class Workbench implements IPartService {
 				role: 'complementary'
 			});
 
-		this.panelPart.create(panelPartContainer);
+		this.panelPart.create(panelPartContainer.getHTMLElement());
 	}
 
 	private createEditorPart(): void {
@@ -1262,7 +1263,7 @@ export class Workbench implements IPartService {
 				role: 'main'
 			});
 
-		this.editorPart.create(editorContainer);
+		this.editorPart.create(editorContainer.getHTMLElement());
 	}
 
 	private createStatusbarPart(): void {
@@ -1272,7 +1273,7 @@ export class Workbench implements IPartService {
 			role: 'contentinfo'
 		});
 
-		this.statusbarPart.create(statusbarContainer);
+		this.statusbarPart.create(statusbarContainer.getHTMLElement());
 	}
 
 	private createNotificationsHandlers(): void {
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index bbf67306fc4..dcdbd5ae3d9 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/debugActionsWidget';
 import * as errors from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
 import * as browser from 'vs/base/browser/browser';
-import * as builder from 'vs/base/browser/builder';
+import { $, Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -31,7 +31,6 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { RunOnceScheduler } from 'vs/base/common/async';
 
-const $ = builder.$;
 const DEBUG_ACTIONS_WIDGET_POSITION_KEY = 'debug.actionswidgetposition';
 
 export const debugToolBarBackground = registerColor('debugToolBar.background', {
@@ -47,8 +46,8 @@ export const debugToolBarBorder = registerColor('debugToolBar.border', {
 
 export class DebugActionsWidget extends Themable implements IWorkbenchContribution {
 
-	private $el: builder.Builder;
-	private dragArea: builder.Builder;
+	private $el: Builder;
+	private dragArea: Builder;
 	private actionBar: ActionBar;
 	private allActions: AbstractDebugAction[];
 	private activeActions: AbstractDebugAction[];
diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
index b3bcf05b04c..5470e587f06 100644
--- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
@@ -5,7 +5,6 @@
 
 import 'vs/css!./media/debugViewlet';
 import * as nls from 'vs/nls';
-import { Builder } from 'vs/base/browser/builder';
 import { Action, IAction } from 'vs/base/common/actions';
 import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -56,11 +55,10 @@ export class DebugViewlet extends PersistentViewsViewlet {
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateTitleArea()));
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
-		const el = parent.getHTMLElement();
-		DOM.addClass(el, 'debug-viewlet');
+		DOM.addClass(parent, 'debug-viewlet');
 	}
 
 	public focus(): void {
diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts
index a3551f72a7a..f11e1016db6 100644
--- a/src/vs/workbench/parts/debug/electron-browser/repl.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts
@@ -10,7 +10,6 @@ import { wireCancellationToken } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import { IAction } from 'vs/base/common/actions';
-import { Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { isMacintosh } from 'vs/base/common/platform';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -127,9 +126,9 @@ export class Repl extends Panel implements IPrivateReplService {
 		}
 	}
 
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
-		this.container = dom.append(parent.getHTMLElement(), $('.repl'));
+		this.container = dom.append(parent, $('.repl'));
 		this.treeContainer = dom.append(this.container, $('.repl-tree'));
 		this.createReplInput(this.container);
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index 08780638219..5f42b7941f4 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -17,7 +17,6 @@ import Cache from 'vs/base/common/cache';
 import { Action } from 'vs/base/common/actions';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { Builder } from 'vs/base/browser/builder';
 import { domEvent } from 'vs/base/browser/event';
 import { append, $, addClass, removeClass, finalHandler, join, toggleClass } from 'vs/base/browser/dom';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -206,10 +205,8 @@ export class ExtensionEditor extends BaseEditor {
 		this.findInputFocusContextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(this.contextKeyService);
 	}
 
-	createEditor(parent: Builder): void {
-		const container = parent.getHTMLElement();
-
-		const root = append(container, $('.extension-editor'));
+	createEditor(parent: HTMLElement): void {
+		const root = append(parent, $('.extension-editor'));
 		this.header = append(root, $('.header'));
 
 		this.icon = append(this.header, $<HTMLImageElement>('img.icon', { draggable: false }));
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index ca6ef161be3..1a3afdd8357 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -12,7 +12,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { isPromiseCanceledError, onUnexpectedError, create as createError } from 'vs/base/common/errors';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Builder } from 'vs/base/browser/builder';
 import { Event as EventOf, mapEvent, chain } from 'vs/base/common/event';
 import { IAction } from 'vs/base/common/actions';
 import { domEvent } from 'vs/base/browser/event';
@@ -249,9 +248,9 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		};
 	}
 
-	async create(parent: Builder): TPromise<void> {
-		parent.addClass('extensions-viewlet');
-		this.root = parent.getHTMLElement();
+	async create(parent: HTMLElement): TPromise<void> {
+		addClass(parent, 'extensions-viewlet');
+		this.root = parent;
 
 		const header = append(this.root, $('.header'));
 
@@ -278,7 +277,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 
 		this.onSearchChange = mapEvent(onSearchInput, e => e.target.value);
 
-		await super.create(new Builder(this.extensionsBox));
+		await super.create(this.extensionsBox);
 
 		const installed = await this.extensionManagementService.getInstalled(LocalExtensionType.User);
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index 76dae04de2d..802cc4d1615 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -14,7 +14,6 @@ import { EditorInput } from 'vs/workbench/common/editor';
 import pkg from 'vs/platform/node/package';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder } from 'vs/base/browser/builder';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -212,10 +211,8 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 		return result;
 	}
 
-	protected createEditor(parent: Builder): void {
-		const container = parent.getHTMLElement();
-
-		addClass(container, 'runtime-extensions-editor');
+	protected createEditor(parent: HTMLElement): void {
+		addClass(parent, 'runtime-extensions-editor');
 
 		const TEMPLATE_ID = 'runtimeExtensionElementTemplate';
 
@@ -362,7 +359,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 			}
 		};
 
-		this._list = this._instantiationService.createInstance(WorkbenchList, container, delegate, [renderer], {
+		this._list = this._instantiationService.createInstance(WorkbenchList, parent, delegate, [renderer], {
 			multipleSelectionSupport: false
 		}) as WorkbenchList<IRuntimeExtension>;
 
diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
index 714e365c394..fe8a56d8938 100644
--- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
+++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
@@ -10,7 +10,6 @@ import { localize } from 'vs/nls';
 import { IActionRunner } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
-import { Builder } from 'vs/base/browser/builder';
 import { VIEWLET_ID, ExplorerViewletVisibleContext, IFilesConfiguration, OpenEditorsVisibleContext, OpenEditorsVisibleCondition, IExplorerViewlet } from 'vs/workbench/parts/files/common/files';
 import { PersistentViewsViewlet, IViewletViewOptions, ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
@@ -171,11 +170,10 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer
 		this._register(this.contextService.onDidChangeWorkspaceName(e => this.updateTitleArea()));
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
-		const el = parent.getHTMLElement();
-		DOM.addClass(el, 'explorer-viewlet');
+		DOM.addClass(parent, 'explorer-viewlet');
 	}
 
 	private isOpenEditorsVisible(): boolean {
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
index c98732c93e7..9a9c28d97ae 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -6,7 +6,6 @@
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
 import URI from 'vs/base/common/uri';
 import { ThrottledDelayer, Delayer } from 'vs/base/common/async';
 import * as errors from 'vs/base/common/errors';
@@ -160,7 +159,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 	public renderBody(container: HTMLElement): void {
 		this.treeContainer = DOM.append(container, DOM.$('.explorer-folders-view'));
-		this.tree = this.createViewer($(this.treeContainer));
+		this.tree = this.createViewer(this.treeContainer);
 
 		if (this.toolbar) {
 			this.toolbar.setActions(this.getActions(), this.getSecondaryActions())();
@@ -394,7 +393,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		return model;
 	}
 
-	private createViewer(container: Builder): WorkbenchTree {
+	private createViewer(container: HTMLElement): WorkbenchTree {
 		const dataSource = this.instantiationService.createInstance(FileDataSource);
 		const renderer = this.instantiationService.createInstance(FileRenderer, this.viewletState);
 		const controller = this.instantiationService.createInstance(FileController);
@@ -406,7 +405,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		const dnd = this.instantiationService.createInstance(FileDragAndDrop);
 		const accessibilityProvider = this.instantiationService.createInstance(FileAccessibilityProvider);
 
-		this.explorerViewer = this.instantiationService.createInstance(FileIconThemableWorkbenchTree, container.getHTMLElement(), {
+		this.explorerViewer = this.instantiationService.createInstance(FileIconThemableWorkbenchTree, container, {
 			dataSource,
 			renderer,
 			controller,
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index 4a9472862ee..a4fa6c015c1 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -8,7 +8,6 @@
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
-import { Builder } from 'vs/base/browser/builder';
 import { empty as EmptyDisposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
 import { EditorOptions, EditorInput } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
@@ -78,11 +77,11 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		super.dispose();
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 		this._content = document.createElement('div');
 		this._content.style.position = 'absolute';
 		this._content.classList.add(HtmlPreviewPart.class);
-		parent.getHTMLElement().appendChild(this._content);
+		parent.appendChild(this._content);
 	}
 
 	private get webview(): Webview {
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index 31136c190fc..e5b909416af 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -10,7 +10,6 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Delayer } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
-import * as builder from 'vs/base/browser/builder';
 import { IAction, Action } from 'vs/base/common/actions';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -68,15 +67,15 @@ export class MarkersPanel extends Panel {
 		this.autoExpanded = new Set<string>();
 	}
 
-	public create(parent: builder.Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
 		this.rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
 		this.toUnbind.push(this.rangeHighlightDecorations);
 
-		dom.addClass(parent.getHTMLElement(), 'markers-panel');
+		dom.addClass(parent, 'markers-panel');
 
-		let container = dom.append(parent.getHTMLElement(), dom.$('.markers-panel-container'));
+		let container = dom.append(parent, dom.$('.markers-panel-container'));
 
 		this.createMessageBox(container);
 		this.createTree(container);
diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts
index 36673ad91e0..35afc6d3e48 100644
--- a/src/vs/workbench/parts/output/browser/outputPanel.ts
+++ b/src/vs/workbench/parts/output/browser/outputPanel.ts
@@ -7,7 +7,6 @@ import 'vs/css!./media/output';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder } from 'vs/base/browser/builder';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -121,9 +120,9 @@ export class OutputPanel extends AbstractTextResourceEditor {
 		super.clearInput();
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 		// First create the scoped instantation service and only then construct the editor using the scoped service
-		const scopedContextKeyService = this.contextKeyService.createScoped(parent.getHTMLElement());
+		const scopedContextKeyService = this.contextKeyService.createScoped(parent);
 		this.toUnbind.push(scopedContextKeyService);
 		this.scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService]));
 		super.createEditor(parent);
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index ec96d8d0f85..ea9696016b3 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -11,7 +11,6 @@ import * as DOM from 'vs/base/browser/dom';
 import { OS } from 'vs/base/common/platform';
 import { dispose } from 'vs/base/common/lifecycle';
 import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
-import { Builder } from 'vs/base/browser/builder';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { IAction } from 'vs/base/common/actions';
@@ -122,16 +121,14 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		this.delayedFilterLogging = new Delayer<void>(1000);
 	}
 
-	createEditor(parent: Builder): void {
-		const parentElement = parent.getHTMLElement();
-
-		const keybindingsEditorElement = DOM.append(parentElement, $('div', { class: 'keybindings-editor' }));
+	createEditor(parent: HTMLElement): void {
+		const keybindingsEditorElement = DOM.append(parent, $('div', { class: 'keybindings-editor' }));
 
 		this.createOverlayContainer(keybindingsEditorElement);
 		this.createHeader(keybindingsEditorElement);
 		this.createBody(keybindingsEditorElement);
 
-		const focusTracker = this._register(DOM.trackFocus(parentElement));
+		const focusTracker = this._register(DOM.trackFocus(parent));
 		this._register(focusTracker.onDidFocus(() => this.keybindingsEditorContextKey.set(true)));
 		this._register(focusTracker.onDidBlur(() => this.keybindingsEditorContextKey.reset()));
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index fad5c212b78..70c4761e517 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -11,7 +11,6 @@ import { onUnexpectedError, isPromiseCanceledError, getErrorMessage } from 'vs/b
 import * as DOM from 'vs/base/browser/dom';
 import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
 import * as arrays from 'vs/base/common/arrays';
-import { Builder } from 'vs/base/browser/builder';
 import { ArrayNavigator } from 'vs/base/common/iterator';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
@@ -138,11 +137,10 @@ export class PreferencesEditor extends BaseEditor {
 		this.remoteSearchThrottle = new ThrottledDelayer(200);
 	}
 
-	public createEditor(parent: Builder): void {
-		const parentElement = parent.getHTMLElement();
-		DOM.addClass(parentElement, 'preferences-editor');
+	public createEditor(parent: HTMLElement): void {
+		DOM.addClass(parent, 'preferences-editor');
 
-		this.headerContainer = DOM.append(parentElement, DOM.$('.preferences-header'));
+		this.headerContainer = DOM.append(parent, DOM.$('.preferences-header'));
 
 		this.searchWidget = this._register(this.instantiationService.createInstance(SearchWidget, this.headerContainer, {
 			ariaLabel: nls.localize('SearchSettingsWidget.AriaLabel', "Search settings"),
@@ -154,7 +152,7 @@ export class PreferencesEditor extends BaseEditor {
 		this._register(this.searchWidget.onFocus(() => this.lastFocusedWidget = this.searchWidget));
 		this.lastFocusedWidget = this.searchWidget;
 
-		const editorsContainer = DOM.append(parentElement, DOM.$('.preferences-editors-container'));
+		const editorsContainer = DOM.append(parent, DOM.$('.preferences-editors-container'));
 		this.sideBySidePreferencesWidget = this._register(this.instantiationService.createInstance(SideBySidePreferencesWidget, editorsContainer));
 		this._register(this.sideBySidePreferencesWidget.onFocus(() => this.lastFocusedWidget = this.sideBySidePreferencesWidget));
 		this._register(this.sideBySidePreferencesWidget.onDidSettingsTargetChange(target => this.switchSettings(target)));
@@ -817,7 +815,7 @@ class SideBySidePreferencesWidget extends Widget {
 		this.defaultPreferencesHeader.textContent = nls.localize('defaultSettings', "Default Settings");
 
 		this.defaultPreferencesEditor = this._register(this.instantiationService.createInstance(DefaultPreferencesEditor));
-		this.defaultPreferencesEditor.create(new Builder(this.defaultPreferencesEditorContainer));
+		this.defaultPreferencesEditor.create(this.defaultPreferencesEditorContainer);
 		this.defaultPreferencesEditor.setVisible(true);
 		(<CodeEditor>this.defaultPreferencesEditor.getControl()).onDidFocusEditor(() => this.lastFocusedEditor = this.defaultPreferencesEditor);
 
@@ -902,7 +900,7 @@ class SideBySidePreferencesWidget extends Widget {
 		const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(editorInput);
 		const editor = descriptor.instantiate(this.instantiationService);
 		this.editablePreferencesEditor = editor;
-		this.editablePreferencesEditor.create(new Builder(this.editablePreferencesEditorContainer));
+		this.editablePreferencesEditor.create(this.editablePreferencesEditorContainer);
 		this.editablePreferencesEditor.setVisible(true);
 		(<CodeEditor>this.editablePreferencesEditor.getControl()).onDidFocusEditor(() => this.lastFocusedEditor = this.editablePreferencesEditor);
 		this.lastFocusedEditor = this.editablePreferencesEditor;
@@ -990,8 +988,8 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		super(DefaultPreferencesEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorGroupService);
 	}
 
-	public createEditorControl(parent: Builder, configuration: IEditorOptions): editorCommon.IEditor {
-		const editor = this.instantiationService.createInstance(DefaultPreferencesCodeEditor, parent.getHTMLElement(), configuration);
+	public createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
+		const editor = this.instantiationService.createInstance(DefaultPreferencesCodeEditor, parent, configuration);
 
 		// Inform user about editor being readonly if user starts type
 		this.toUnbind.push(editor.onDidType(() => this.showReadonlyHint(editor)));
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index 3a7e31b081d..46d44ddbc61 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -13,7 +13,6 @@ import { domEvent, stop } from 'vs/base/browser/event';
 import { basename } from 'vs/base/common/paths';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose, combinedDisposable, empty as EmptyDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Builder } from 'vs/base/browser/builder';
 import { PanelViewlet, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { append, $, addClass, toggleClass, trackFocus, Dimension } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -1073,13 +1072,13 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		this.menus.onDidChangeTitle(this.updateTitleArea, this, this.disposables);
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
-		this.el = parent.getHTMLElement();
+		this.el = parent;
 		addClass(this.el, 'scm-viewlet');
 		addClass(this.el, 'empty');
-		append(parent.getHTMLElement(), $('div.empty-message', null, localize('no open repo', "There are no active source control providers.")));
+		append(parent, $('div.empty-message', null, localize('no open repo', "There are no active source control providers.")));
 
 		this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
 		this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 675c13c025d..6c6b5d03b53 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -31,7 +31,7 @@ import URI from 'vs/base/common/uri';
 export function isSearchViewFocused(viewletService: IViewletService, panelService: IPanelService): boolean {
 	let searchView = getSearchView(viewletService, panelService);
 	let activeElement = document.activeElement;
-	return searchView && activeElement && DOM.isAncestor(activeElement, searchView.getContainer().getHTMLElement());
+	return searchView && activeElement && DOM.isAncestor(activeElement, searchView.getContainer());
 }
 
 export function appendKeyBindingLabel(label: string, keyBinding: number | ResolvedKeybinding, keyBindingService2: IKeybindingService): string {
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index b216b8bb235..054283ed6c5 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -164,12 +164,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 	}
 
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
 		this.viewModel = this.searchWorkbenchService.searchModel;
 		let builder: Builder;
-		parent.div({
+		$(parent).div({
 			'class': 'search-view'
 		}, (div) => {
 			builder = div;
@@ -754,9 +754,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 
 		if (this.size.width >= SearchView.WIDE_VIEW_SIZE) {
-			this.getContainer().addClass(SearchView.WIDE_CLASS_NAME);
+			dom.addClass(this.getContainer(), SearchView.WIDE_CLASS_NAME);
 		} else {
-			this.getContainer().removeClass(SearchView.WIDE_CLASS_NAME);
+			dom.removeClass(this.getContainer(), SearchView.WIDE_CLASS_NAME);
 		}
 
 		this.searchWidget.setWidth(this.size.width - 28 /* container margin */);
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 9dae269eac1..28ee56fb5a6 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -18,7 +18,6 @@ import { Action } from 'vs/base/common/actions';
 import * as Dom from 'vs/base/browser/dom';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
-import * as Builder from 'vs/base/browser/builder';
 import * as Types from 'vs/base/common/types';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { TerminateResponseCode } from 'vs/base/common/processes';
@@ -88,7 +87,6 @@ import { QuickOpenActionContributor } from '../browser/quickOpen';
 import { Themable, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND } from 'vs/workbench/common/theme';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
-let $ = Builder.$;
 let tasksCategory = nls.localize('tasksCategory', "Tasks");
 
 namespace ConfigureTaskAction {
@@ -175,17 +173,16 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 		Dom.addClass(infoIcon, 'mask-icon');
 		label.appendChild(infoIcon);
 		this.icons.push(infoIcon);
-		$(infoIcon).hide();
+		Dom.hide(infoIcon);
 
 		Dom.addClass(info, 'task-statusbar-item-label-counter');
 		label.appendChild(info);
-		$(info).hide();
+		Dom.hide(info);
 
 		Dom.addClass(building, 'task-statusbar-item-building');
 		element.appendChild(building);
 		building.innerHTML = nls.localize('building', 'Building...');
-		$(building).hide();
-
+		Dom.hide(building);
 
 		callOnDispose.push(Dom.addDisposableListener(label, 'click', (e: MouseEvent) => {
 			const panel = this.panelService.getActivePanel();
@@ -206,11 +203,11 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 			if (stats.infos > 0) {
 				info.innerHTML = packNumber(stats.infos);
 				info.title = infoIcon.title = infoTitle(stats.infos);
-				$(info).show();
-				$(infoIcon).show();
+				Dom.show(info);
+				Dom.show(infoIcon);
 			} else {
-				$(info).hide();
-				$(infoIcon).hide();
+				Dom.hide(info);
+				Dom.hide(infoIcon);
 			}
 		};
 
@@ -226,7 +223,7 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 				case TaskEventKind.Active:
 					this.activeCount++;
 					if (this.activeCount === 1) {
-						$(building).show();
+						Dom.show(building);
 					}
 					break;
 				case TaskEventKind.Inactive:
@@ -235,13 +232,13 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 					if (this.activeCount > 0) {
 						this.activeCount--;
 						if (this.activeCount === 0) {
-							$(building).hide();
+							Dom.hide(building);
 						}
 					}
 					break;
 				case TaskEventKind.Terminated:
 					if (this.activeCount !== 0) {
-						$(building).hide();
+						Dom.hide(building);
 						this.activeCount = 0;
 					}
 					break;
@@ -299,7 +296,7 @@ class TaskStatusBarItem extends Themable implements IStatusbarItem {
 		let label = new OcticonLabel(labelElement);
 		label.title = nls.localize('runningTasks', "Show Running Tasks");
 
-		$(element).hide();
+		Dom.hide(element);
 
 		callOnDispose.push(Dom.addDisposableListener(labelElement, 'click', (e: MouseEvent) => {
 			(this.taskService as TaskService).runShowTasks();
@@ -308,10 +305,10 @@ class TaskStatusBarItem extends Themable implements IStatusbarItem {
 		let updateStatus = (): void => {
 			this.taskService.getActiveTasks().then(tasks => {
 				if (tasks.length === 0) {
-					$(element).hide();
+					Dom.hide(element);
 				} else {
 					label.text = `$(tools) ${tasks.length}`;
-					$(element).show();
+					Dom.show(element);
 				}
 			});
 		};
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index c41c318e81b..336d07d9a95 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -9,7 +9,6 @@ import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
 import * as platform from 'vs/base/common/platform';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder } from 'vs/base/browser/builder';
 import { IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -53,9 +52,9 @@ export class TerminalPanel extends Panel {
 		super(TERMINAL_PANEL_ID, telemetryService, themeService);
 	}
 
-	public create(parent: Builder): TPromise<any> {
+	public create(parent: HTMLElement): TPromise<any> {
 		super.create(parent);
-		this._parentDomElement = parent.getHTMLElement();
+		this._parentDomElement = parent;
 		dom.addClass(this._parentDomElement, 'integrated-terminal');
 		this._themeStyleElement = document.createElement('style');
 		this._fontStyleElement = document.createElement('style');
@@ -72,7 +71,7 @@ export class TerminalPanel extends Panel {
 
 		this._attachEventListeners();
 
-		this._terminalService.setContainers(this.getContainer().getHTMLElement(), this._terminalContainer);
+		this._terminalService.setContainers(this.getContainer(), this._terminalContainer);
 
 		this._register(this.themeService.onThemeChange(theme => this._updateTheme(theme)));
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index d4e8afff2b5..bfc40a60fff 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -8,7 +8,6 @@ import { IDisposable, } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
 import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from 'vs/workbench/parts/html/electron-browser/baseWebviewEditor';
-import { Builder } from 'vs/base/browser/builder';
 import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -47,10 +46,10 @@ export class WebviewEditor extends BaseWebviewEditor {
 		super(WebviewEditor.ID, telemetryService, themeService, _contextKeyService);
 	}
 
-	protected createEditor(parent: Builder): void {
-		this.editorFrame = parent.getHTMLElement();
+	protected createEditor(parent: HTMLElement): void {
+		this.editorFrame = parent;
 		this.content = document.createElement('div');
-		parent.append(this.content);
+		parent.appendChild(this.content);
 	}
 
 	private doUpdateContainer() {
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index 1d32c0c1670..5e1223341a8 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -11,7 +11,6 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import * as strings from 'vs/base/common/strings';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { $, Builder } from 'vs/base/browser/builder';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -40,7 +39,7 @@ import { UILabelProvider } from 'vs/base/common/keybindingLabels';
 import { OS, OperatingSystem } from 'vs/base/common/platform';
 import { deepClone } from 'vs/base/common/objects';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Dimension } from 'vs/base/browser/dom';
+import { Dimension, size } from 'vs/base/browser/dom';
 
 export const WALK_THROUGH_FOCUS = new RawContextKey<boolean>('interactivePlaygroundFocus', false);
 
@@ -109,9 +108,7 @@ export class WalkThroughPart extends BaseEditor {
 		this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService);
 	}
 
-	createEditor(parent: Builder): void {
-		const container = parent.getHTMLElement();
-
+	createEditor(container: HTMLElement): void {
 		this.content = document.createElement('div');
 		this.content.tabIndex = 0;
 		this.content.style.outlineStyle = 'none';
@@ -215,9 +212,9 @@ export class WalkThroughPart extends BaseEditor {
 		return uri.with({ query: JSON.stringify(query) });
 	}
 
-	layout(size: Dimension): void {
-		this.size = size;
-		$(this.content).style({ height: `${size.height}px`, width: `${size.width}px` });
+	layout(dimension: Dimension): void {
+		this.size = dimension;
+		size(this.content, dimension.width, dimension.height);
 		this.updateSizeClasses();
 		this.contentDisposables.forEach(disposable => {
 			if (disposable instanceof CodeEditor) {
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
index 27dea733652..4ba14edc657 100644
--- a/src/vs/workbench/test/browser/part.test.ts
+++ b/src/vs/workbench/test/browser/part.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Builder } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { Part } from 'vs/workbench/browser/part';
 import * as Types from 'vs/base/common/types';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -16,16 +16,16 @@ import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
 
 class MyPart extends Part {
 
-	constructor(private expectedParent: Builder) {
+	constructor(private expectedParent: HTMLElement) {
 		super('myPart', { hasTitle: true }, new TestThemeService());
 	}
 
-	public createTitleArea(parent: Builder): Builder {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
 		assert.strictEqual(parent, this.expectedParent);
 		return super.createTitleArea(parent);
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		assert.strictEqual(parent, this.expectedParent);
 		return super.createContentArea(parent);
 	}
@@ -41,22 +41,22 @@ class MyPart2 extends Part {
 		super('myPart2', { hasTitle: true }, new TestThemeService());
 	}
 
-	public createTitleArea(parent: Builder): Builder {
-		return parent.div(function (div) {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
+		return $(parent).div(function (div) {
 			div.span({
 				id: 'myPart.title',
 				innerHtml: 'Title'
 			});
-		});
+		}).getHTMLElement();
 	}
 
-	public createContentArea(parent: Builder): Builder {
-		return parent.div(function (div) {
+	public createContentArea(parent: HTMLElement): HTMLElement {
+		return $(parent).div(function (div) {
 			div.span({
 				id: 'myPart.content',
 				innerHtml: 'Content'
 			});
-		});
+		}).getHTMLElement();
 	}
 }
 
@@ -66,17 +66,17 @@ class MyPart3 extends Part {
 		super('myPart2', { hasTitle: false }, new TestThemeService());
 	}
 
-	public createTitleArea(parent: Builder): Builder {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
 		return null;
 	}
 
-	public createContentArea(parent: Builder): Builder {
-		return parent.div(function (div) {
+	public createContentArea(parent: HTMLElement): HTMLElement {
+		return $(parent).div(function (div) {
 			div.span({
 				id: 'myPart.content',
 				innerHtml: 'Content'
 			});
-		});
+		}).getHTMLElement();
 	}
 }
 
@@ -100,11 +100,10 @@ suite('Workbench Part', () => {
 		let b = new Builder(document.getElementById(fixtureId));
 		b.div().hide();
 
-		let part = new MyPart(b);
-		part.create(b);
+		let part = new MyPart(b.getHTMLElement());
+		part.create(b.getHTMLElement());
 
 		assert.strictEqual(part.getId(), 'myPart');
-		assert.strictEqual(part.getContainer(), b);
 
 		// Memento
 		let memento = part.getMemento(storage);
@@ -115,7 +114,7 @@ suite('Workbench Part', () => {
 		part.shutdown();
 
 		// Re-Create to assert memento contents
-		part = new MyPart(b);
+		part = new MyPart(b.getHTMLElement());
 
 		memento = part.getMemento(storage);
 		assert(memento);
@@ -127,7 +126,7 @@ suite('Workbench Part', () => {
 		delete memento.bar;
 
 		part.shutdown();
-		part = new MyPart(b);
+		part = new MyPart(b.getHTMLElement());
 		memento = part.getMemento(storage);
 		assert(memento);
 		assert.strictEqual(Types.isEmptyObject(memento), true);
@@ -138,7 +137,7 @@ suite('Workbench Part', () => {
 		b.div().hide();
 
 		let part = new MyPart2();
-		part.create(b);
+		part.create(b.getHTMLElement());
 
 		assert(document.getElementById('myPart.title'));
 		assert(document.getElementById('myPart.content'));
@@ -149,7 +148,7 @@ suite('Workbench Part', () => {
 		b.div().hide();
 
 		let part = new MyPart3();
-		part.create(b);
+		part.create(b.getHTMLElement());
 
 		assert(!document.getElementById('myPart.title'));
 		assert(document.getElementById('myPart.content'));

From 6caf60fa704d8df191ffc0bedf5fe8f4eb9bcd1e Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 4 Apr 2018 10:15:18 +0200
Subject: [PATCH 314/383] fix  #43429

---
 .../editor/contrib/suggest/suggestMemory.ts   | 24 ++++++++++++-------
 .../suggest/test/suggestMemory.test.ts        | 18 ++++++++++++--
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts
index 5256dd4bce4..29c6afc906d 100644
--- a/src/vs/editor/contrib/suggest/suggestMemory.ts
+++ b/src/vs/editor/contrib/suggest/suggestMemory.ts
@@ -66,18 +66,24 @@ export class LRUMemory extends Memory {
 		// in order of completions, select the first
 		// that has been used in the past
 		let { word } = model.getWordUntilPosition(pos);
+		if (word.length !== 0) {
+			return 0;
+		}
+
+		let lineSuffix = model.getLineContent(pos.lineNumber).substr(pos.column - 10, pos.column - 1);
+		if (/\s$/.test(lineSuffix)) {
+			return 0;
+		}
 
 		let res = 0;
 		let seq = -1;
-		if (word.length === 0) {
-			for (let i = 0; i < items.length; i++) {
-				const { suggestion } = items[i];
-				const key = `${model.getLanguageIdentifier().language}/${suggestion.label}`;
-				const item = this._cache.get(key);
-				if (item && item.touch > seq && item.type === suggestion.type && item.insertText === suggestion.insertText) {
-					seq = item.touch;
-					res = i;
-				}
+		for (let i = 0; i < items.length; i++) {
+			const { suggestion } = items[i];
+			const key = `${model.getLanguageIdentifier().language}/${suggestion.label}`;
+			const item = this._cache.get(key);
+			if (item && item.touch > seq && item.type === suggestion.type && item.insertText === suggestion.insertText) {
+				seq = item.touch;
+				res = i;
 			}
 		}
 		return res;
diff --git a/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts b/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
index 9d69016057f..4025fcd221e 100644
--- a/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
@@ -21,7 +21,7 @@ suite('SuggestMemories', function () {
 
 	setup(function () {
 		pos = { lineNumber: 1, column: 1 };
-		buffer = TextModel.createFromString('This is some text');
+		buffer = TextModel.createFromString('This is some text.\nthis.\nfoo: ,');
 		items = [
 			createSuggestItem('foo', 0),
 			createSuggestItem('bar', 0)
@@ -39,7 +39,9 @@ suite('SuggestMemories', function () {
 		mem.memorize(buffer, pos, null);
 	});
 
-	test('ShyMemories', function () {
+	test('LRUMemory', function () {
+
+		pos = { lineNumber: 2, column: 6 };
 
 		const mem = new LRUMemory();
 		mem.memorize(buffer, pos, items[1]);
@@ -59,7 +61,19 @@ suite('SuggestMemories', function () {
 			createSuggestItem('new1', 0),
 			createSuggestItem('new2', 0)
 		]), 0);
+	});
 
+	test('intellisense is not showing top options first #43429', function () {
+		// ensure we don't memorize for whitespace prefixes
+
+		pos = { lineNumber: 2, column: 6 };
+		const mem = new LRUMemory();
+
+		mem.memorize(buffer, pos, items[1]);
+		assert.equal(mem.select(buffer, pos, items), 1);
+
+		assert.equal(mem.select(buffer, { lineNumber: 3, column: 5 }, items), 0); // foo: |,
+		assert.equal(mem.select(buffer, { lineNumber: 3, column: 6 }, items), 1); // foo: ,|
 	});
 
 	test('PrefixMemory', function () {

From 5c0cee98bfbd5f174e63bb1950bea7a6cb0bac88 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 4 Apr 2018 10:53:50 +0200
Subject: [PATCH 315/383] Fix #46951

---
 .../common/extensionEnablementService.ts      |  8 +++++++-
 .../common/extensionEnablementService.test.ts | 19 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
index 945ae66a841..28c6ce6805f 100644
--- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -78,7 +78,13 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 	}
 
 	canChangeEnablement(extension: ILocalExtension): boolean {
-		return !this.environmentService.disableExtensions && !(extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length);
+		if (extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length) {
+			return false;
+		}
+		if (extension.type === LocalExtensionType.User && this.environmentService.disableExtensions) {
+			return false;
+		}
+		return true;
 	}
 
 	setEnablement(arg: ILocalExtension | IExtensionIdentifier, newState: EnablementState): TPromise<boolean> {
diff --git a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
index f4feeba2973..717a17dd3b0 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent, EnablementState, IExtensionContributions, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent, EnablementState, IExtensionContributions, ILocalExtension, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { Emitter } from 'vs/base/common/event';
@@ -324,6 +324,20 @@ suite('ExtensionEnablementService Test', () => {
 	test('test canChangeEnablement return false for language packs', () => {
 		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a', { localizations: [{ languageId: 'gr', translations: [{ id: 'vscode', path: 'path' }] }] })), false);
 	});
+
+	test('test canChangeEnablement return false when extensions are disabled in environment', () => {
+		instantiationService.stub(IEnvironmentService, { disableExtensions: true } as IEnvironmentService);
+		testObject = new TestExtensionEnablementService(instantiationService);
+		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a')), false);
+	});
+
+	test('test canChangeEnablement return true for system extensions when extensions are disabled in environment', () => {
+		instantiationService.stub(IEnvironmentService, { disableExtensions: true } as IEnvironmentService);
+		testObject = new TestExtensionEnablementService(instantiationService);
+		const extension = aLocalExtension('pub.a');
+		extension.type = LocalExtensionType.System;
+		assert.equal(testObject.canChangeEnablement(extension), true);
+	});
 });
 
 function aLocalExtension(id: string, contributes?: IExtensionContributions): ILocalExtension {
@@ -334,6 +348,7 @@ function aLocalExtension(id: string, contributes?: IExtensionContributions): ILo
 			name,
 			publisher,
 			contributes
-		}
+		},
+		type: LocalExtensionType.User
 	});
 }

From e2d003c41f702616faa494245ca203e0fc95d231 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 4 Apr 2018 11:09:37 +0200
Subject: [PATCH 316/383] Increase retry time to 30s

---
 .../extensionManagement/node/extensionManagementService.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 21960eff79c..7418a9e3985 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -419,7 +419,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 
 	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string): TPromise<void> {
 		return this.extract(id, zipPath, extractPath)
-			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (20 * 1000) /* Retry for 20 seconds */)
+			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (30 * 1000) /* Retry for 30 seconds */)
 				.then(
 					() => this.logService.info('Renamed to', renamePath),
 					e => {

From 6289e7095ed65187a3de2d0f232649d9b0d81e42 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 4 Apr 2018 10:23:14 +0200
Subject: [PATCH 317/383] Make readFromTextArea a static method

---
 src/vs/editor/browser/controller/textAreaInput.ts           | 4 ++--
 src/vs/editor/browser/controller/textAreaState.ts           | 2 +-
 src/vs/editor/test/browser/controller/textAreaState.test.ts | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/textAreaInput.ts
index a96c80dbbf2..fd40e350b99 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/textAreaInput.ts
@@ -147,7 +147,7 @@ export class TextAreaInput extends Disposable {
 		 */
 		const deduceInputFromTextAreaValue = (couldBeEmojiInput: boolean): [TextAreaState, ITypeData] => {
 			const oldState = this._textAreaState;
-			const newState = this._textAreaState.readFromTextArea(this._textArea);
+			const newState = TextAreaState.readFromTextArea(this._textArea);
 			return [newState, TextAreaState.deduceInput(oldState, newState, couldBeEmojiInput)];
 		};
 
@@ -223,7 +223,7 @@ export class TextAreaInput extends Disposable {
 			// Due to isEdgeOrIE (where the textarea was not cleared initially) and isChrome (the textarea is not updated correctly when composition ends)
 			// we cannot assume the text at the end consists only of the composited text
 			if (browser.isEdgeOrIE || browser.isChrome) {
-				this._textAreaState = this._textAreaState.readFromTextArea(this._textArea);
+				this._textAreaState = TextAreaState.readFromTextArea(this._textArea);
 			}
 
 			if (!this._isDoingComposition) {
diff --git a/src/vs/editor/browser/controller/textAreaState.ts b/src/vs/editor/browser/controller/textAreaState.ts
index c46ad756789..a9b1b7f6f30 100644
--- a/src/vs/editor/browser/controller/textAreaState.ts
+++ b/src/vs/editor/browser/controller/textAreaState.ts
@@ -51,7 +51,7 @@ export class TextAreaState {
 		return '[ <' + this.value + '>, selectionStart: ' + this.selectionStart + ', selectionEnd: ' + this.selectionEnd + ']';
 	}
 
-	public readFromTextArea(textArea: ITextAreaWrapper): TextAreaState {
+	public static readFromTextArea(textArea: ITextAreaWrapper): TextAreaState {
 		return new TextAreaState(textArea.getValue(), textArea.getSelectionStart(), textArea.getSelectionEnd(), null, null);
 	}
 
diff --git a/src/vs/editor/test/browser/controller/textAreaState.test.ts b/src/vs/editor/test/browser/controller/textAreaState.test.ts
index fce77b0211d..087af746c69 100644
--- a/src/vs/editor/test/browser/controller/textAreaState.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaState.test.ts
@@ -82,7 +82,7 @@ suite('TextAreaState', () => {
 		textArea._value = 'Hello world!';
 		textArea._selectionStart = 1;
 		textArea._selectionEnd = 12;
-		let actual = TextAreaState.EMPTY.readFromTextArea(textArea);
+		let actual = TextAreaState.readFromTextArea(textArea);
 
 		assertTextAreaState(actual, 'Hello world!', 1, 12);
 		assert.equal(actual.value, 'Hello world!');
@@ -132,7 +132,7 @@ suite('TextAreaState', () => {
 		textArea._selectionStart = selectionStart;
 		textArea._selectionEnd = selectionEnd;
 
-		let newState = prevState.readFromTextArea(textArea);
+		let newState = TextAreaState.readFromTextArea(textArea);
 		let actual = TextAreaState.deduceInput(prevState, newState, true);
 
 		assert.equal(actual.text, expected);

From 7335b0cf8857599e8a41b87b5a5799edd940b303 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 4 Apr 2018 11:23:03 +0200
Subject: [PATCH 318/383] Handle the case where typing occurs at offset 0 after
 a focus gain (fixes #42251)

---
 .../browser/controller/textAreaInput.ts       | 51 +++++++++--
 .../browser/controller/textAreaState.ts       | 16 +++-
 .../browser/controller/textAreaState.test.ts  | 84 +++++++++++--------
 3 files changed, 107 insertions(+), 44 deletions(-)

diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/textAreaInput.ts
index fd40e350b99..d3dd81fac4e 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/textAreaInput.ts
@@ -42,6 +42,19 @@ export interface ITextAreaInputHost {
 	deduceModelPosition(viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position;
 }
 
+const enum TextAreaInputEventType {
+	none,
+	compositionstart,
+	compositionupdate,
+	compositionend,
+	input,
+	cut,
+	copy,
+	paste,
+	focus,
+	blur
+}
+
 /**
  * Writes screen reader content to the textarea and is able to analyze its input events to generate:
  *  - onCut
@@ -89,6 +102,7 @@ export class TextAreaInput extends Disposable {
 
 	private readonly _host: ITextAreaInputHost;
 	private readonly _textArea: TextAreaWrapper;
+	private _lastTextAreaEvent: TextAreaInputEventType;
 	private readonly _asyncTriggerCut: RunOnceScheduler;
 
 	private _textAreaState: TextAreaState;
@@ -101,6 +115,7 @@ export class TextAreaInput extends Disposable {
 		super();
 		this._host = host;
 		this._textArea = this._register(new TextAreaWrapper(textArea));
+		this._lastTextAreaEvent = TextAreaInputEventType.none;
 		this._asyncTriggerCut = this._register(new RunOnceScheduler(() => this._onCut.fire(), 0));
 
 		this._textAreaState = TextAreaState.EMPTY;
@@ -129,6 +144,8 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionstart', (e: CompositionEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.compositionstart;
+
 			if (this._isDoingComposition) {
 				return;
 			}
@@ -145,10 +162,10 @@ export class TextAreaInput extends Disposable {
 		/**
 		 * Deduce the typed input from a text area's value and the last observed state.
 		 */
-		const deduceInputFromTextAreaValue = (couldBeEmojiInput: boolean): [TextAreaState, ITypeData] => {
+		const deduceInputFromTextAreaValue = (couldBeEmojiInput: boolean, couldBeTypingAtOffset0: boolean): [TextAreaState, ITypeData] => {
 			const oldState = this._textAreaState;
 			const newState = TextAreaState.readFromTextArea(this._textArea);
-			return [newState, TextAreaState.deduceInput(oldState, newState, couldBeEmojiInput)];
+			return [newState, TextAreaState.deduceInput(oldState, newState, couldBeEmojiInput, couldBeTypingAtOffset0)];
 		};
 
 		/**
@@ -185,6 +202,8 @@ export class TextAreaInput extends Disposable {
 		};
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionupdate', (e: CompositionEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.compositionupdate;
+
 			if (browser.isChromev56) {
 				// See https://github.com/Microsoft/monaco-editor/issues/320
 				// where compositionupdate .data is broken in Chrome v55 and v56
@@ -195,7 +214,7 @@ export class TextAreaInput extends Disposable {
 			}
 
 			if (compositionDataInValid(e.locale)) {
-				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false);
+				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false, /*couldBeTypingAtOffset0*/false);
 				this._textAreaState = newState;
 				this._onType.fire(typeInput);
 				this._onCompositionUpdate.fire(e);
@@ -209,9 +228,11 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionend', (e: CompositionEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.compositionend;
+
 			if (compositionDataInValid(e.locale)) {
 				// https://github.com/Microsoft/monaco-editor/issues/339
-				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false);
+				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false, /*couldBeTypingAtOffset0*/false);
 				this._textAreaState = newState;
 				this._onType.fire(typeInput);
 			} else {
@@ -235,6 +256,10 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'input', () => {
+			// We want to find out if this is the first `input` after a `focus`.
+			const previousEventWasFocus = (this._lastTextAreaEvent === TextAreaInputEventType.focus);
+			this._lastTextAreaEvent = TextAreaInputEventType.input;
+
 			// Pretend here we touched the text area, as the `input` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received input event');
@@ -254,7 +279,7 @@ export class TextAreaInput extends Disposable {
 				return;
 			}
 
-			const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/platform.isMacintosh);
+			const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/platform.isMacintosh, /*couldBeTypingAtOffset0*/previousEventWasFocus && platform.isMacintosh);
 			if (typeInput.replaceCharCnt === 0 && typeInput.text.length === 1 && strings.isHighSurrogate(typeInput.text.charCodeAt(0))) {
 				// Ignore invalid input but keep it around for next time
 				return;
@@ -279,6 +304,8 @@ export class TextAreaInput extends Disposable {
 		// --- Clipboard operations
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'cut', (e: ClipboardEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.cut;
+
 			// Pretend here we touched the text area, as the `cut` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received cut event');
@@ -288,10 +315,14 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'copy', (e: ClipboardEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.copy;
+
 			this._ensureClipboardGetsEditorSelection(e);
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'paste', (e: ClipboardEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.paste;
+
 			// Pretend here we touched the text area, as the `paste` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received paste event');
@@ -312,8 +343,14 @@ export class TextAreaInput extends Disposable {
 			}
 		}));
 
-		this._register(dom.addDisposableListener(textArea.domNode, 'focus', () => this._setHasFocus(true)));
-		this._register(dom.addDisposableListener(textArea.domNode, 'blur', () => this._setHasFocus(false)));
+		this._register(dom.addDisposableListener(textArea.domNode, 'focus', () => {
+			this._lastTextAreaEvent = TextAreaInputEventType.focus;
+			this._setHasFocus(true);
+		}));
+		this._register(dom.addDisposableListener(textArea.domNode, 'blur', () => {
+			this._lastTextAreaEvent = TextAreaInputEventType.blur;
+			this._setHasFocus(false);
+		}));
 
 
 		// See https://github.com/Microsoft/vscode/issues/27216
diff --git a/src/vs/editor/browser/controller/textAreaState.ts b/src/vs/editor/browser/controller/textAreaState.ts
index a9b1b7f6f30..09f54a8a013 100644
--- a/src/vs/editor/browser/controller/textAreaState.ts
+++ b/src/vs/editor/browser/controller/textAreaState.ts
@@ -60,7 +60,7 @@ export class TextAreaState {
 	}
 
 	public writeToTextArea(reason: string, textArea: ITextAreaWrapper, select: boolean): void {
-		// console.log(Date.now() + ': applyToTextArea ' + reason + ': ' + this.toString());
+		// console.log(Date.now() + ': writeToTextArea ' + reason + ': ' + this.toString());
 		textArea.setValue(reason, this.value);
 		if (select) {
 			textArea.setSelectionRange(reason, this.selectionStart, this.selectionEnd);
@@ -97,7 +97,7 @@ export class TextAreaState {
 		return new TextAreaState(text, 0, text.length, null, null);
 	}
 
-	public static deduceInput(previousState: TextAreaState, currentState: TextAreaState, couldBeEmojiInput: boolean): ITypeData {
+	public static deduceInput(previousState: TextAreaState, currentState: TextAreaState, couldBeEmojiInput: boolean, couldBeTypingAtOffset0: boolean): ITypeData {
 		if (!previousState) {
 			// This is the EMPTY state
 			return {
@@ -117,6 +117,18 @@ export class TextAreaState {
 		let currentSelectionStart = currentState.selectionStart;
 		let currentSelectionEnd = currentState.selectionEnd;
 
+		if (couldBeTypingAtOffset0 && previousValue.length > 0 && previousSelectionStart === previousSelectionEnd && currentSelectionStart === currentSelectionEnd) {
+			// See https://github.com/Microsoft/vscode/issues/42251
+			// where typing always happens at offset 0 in the textarea
+			// when using a custom title area in OSX and moving the window
+			if (strings.endsWith(currentValue, previousValue)) {
+				// Looks like something was typed at offset 0
+				// ==> pretend we placed the cursor at offset 0 to begin with...
+				previousSelectionStart = 0;
+				previousSelectionEnd = 0;
+			}
+		}
+
 		// Strip the previous suffix from the value (without interfering with the current selection)
 		const previousSuffix = previousValue.substring(previousSelectionEnd);
 		const currentSuffix = currentValue.substring(currentSelectionEnd);
diff --git a/src/vs/editor/test/browser/controller/textAreaState.test.ts b/src/vs/editor/test/browser/controller/textAreaState.test.ts
index 087af746c69..492ad210207 100644
--- a/src/vs/editor/test/browser/controller/textAreaState.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaState.test.ts
@@ -124,7 +124,7 @@ suite('TextAreaState', () => {
 		textArea.dispose();
 	});
 
-	function testDeduceInput(prevState: TextAreaState, value: string, selectionStart: number, selectionEnd: number, expected: string, expectedCharReplaceCnt: number): void {
+	function testDeduceInput(prevState: TextAreaState, value: string, selectionStart: number, selectionEnd: number, couldBeEmojiInput: boolean, couldBeTypingAtOffset0: boolean, expected: string, expectedCharReplaceCnt: number): void {
 		prevState = prevState || TextAreaState.EMPTY;
 
 		let textArea = new MockTextAreaWrapper();
@@ -133,7 +133,7 @@ suite('TextAreaState', () => {
 		textArea._selectionEnd = selectionEnd;
 
 		let newState = TextAreaState.readFromTextArea(textArea);
-		let actual = TextAreaState.deduceInput(prevState, newState, true);
+		let actual = TextAreaState.deduceInput(prevState, newState, couldBeEmojiInput, couldBeTypingAtOffset0);
 
 		assert.equal(actual.text, expected);
 		assert.equal(actual.replaceCharCnt, expectedCharReplaceCnt);
@@ -154,7 +154,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'ｓ',
-			0, 1,
+			0, 1, true, false,
 			'ｓ', 0
 		);
 
@@ -164,7 +164,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('ｓ', 0, 1, null, null),
 			'せ',
-			0, 1,
+			0, 1, true, false,
 			'せ', 1
 		);
 
@@ -174,7 +174,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せ', 0, 1, null, null),
 			'せｎ',
-			0, 2,
+			0, 2, true, false,
 			'せｎ', 1
 		);
 
@@ -184,7 +184,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せｎ', 0, 2, null, null),
 			'せん',
-			0, 2,
+			0, 2, true, false,
 			'せん', 2
 		);
 
@@ -194,7 +194,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せん', 0, 2, null, null),
 			'せんｓ',
-			0, 3,
+			0, 3, true, false,
 			'せんｓ', 2
 		);
 
@@ -204,7 +204,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんｓ', 0, 3, null, null),
 			'せんせ',
-			0, 3,
+			0, 3, true, false,
 			'せんせ', 3
 		);
 
@@ -214,7 +214,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせ', 0, 3, null, null),
 			'せんせ',
-			0, 3,
+			0, 3, true, false,
 			'せんせ', 3
 		);
 
@@ -224,7 +224,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせ', 0, 3, null, null),
 			'せんせい',
-			0, 4,
+			0, 4, true, false,
 			'せんせい', 3
 		);
 
@@ -234,7 +234,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせい', 0, 4, null, null),
 			'せんせい',
-			4, 4,
+			4, 4, true, false,
 			'', 0
 		);
 	});
@@ -253,7 +253,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせい', 0, 4, null, null),
 			'せんせい',
-			0, 4,
+			0, 4, true, false,
 			'せんせい', 4
 		);
 
@@ -263,7 +263,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせい', 0, 4, null, null),
 			'先生',
-			0, 2,
+			0, 2, true, false,
 			'先生', 4
 		);
 
@@ -273,7 +273,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('先生', 0, 2, null, null),
 			'先生',
-			2, 2,
+			2, 2, true, false,
 			'', 0
 		);
 	});
@@ -282,7 +282,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			null,
 			'a',
-			0, 1,
+			0, 1, true, false,
 			'a', 0
 		);
 	});
@@ -291,7 +291,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState(']\n', 1, 2, null, null),
 			']\n',
-			2, 2,
+			2, 2, true, false,
 			'\n', 0
 		);
 	});
@@ -300,7 +300,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			null,
 			'a',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -309,7 +309,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'a',
-			0, 1,
+			0, 1, true, false,
 			'a', 0
 		);
 	});
@@ -318,7 +318,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'a',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -327,7 +327,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 0, 12, null, null),
 			'H',
-			1, 1,
+			1, 1, true, false,
 			'H', 0
 		);
 	});
@@ -336,7 +336,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 12, 12, null, null),
 			'Hello world!a',
-			13, 13,
+			13, 13, true, false,
 			'a', 0
 		);
 	});
@@ -345,7 +345,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 0, 0, null, null),
 			'aHello world!',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -354,7 +354,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 6, 11, null, null),
 			'Hello other!',
-			11, 11,
+			11, 11, true, false,
 			'other', 0
 		);
 	});
@@ -363,7 +363,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'これは',
-			3, 3,
+			3, 3, true, false,
 			'これは', 0
 		);
 	});
@@ -372,7 +372,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 0, 0, null, null),
 			'Aello world!',
-			1, 1,
+			1, 1, true, false,
 			'A', 0
 		);
 	});
@@ -381,7 +381,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Hellö world!',
-			4, 5,
+			4, 5, true, false,
 			'ö', 0
 		);
 	});
@@ -390,7 +390,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Hellöö world!',
-			5, 5,
+			5, 5, true, false,
 			'öö', 1
 		);
 	});
@@ -399,7 +399,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Helöö world!',
-			5, 5,
+			5, 5, true, false,
 			'öö', 2
 		);
 	});
@@ -408,7 +408,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Hellö world!',
-			5, 5,
+			5, 5, true, false,
 			'ö', 1
 		);
 	});
@@ -417,7 +417,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('a', 0, 1, null, null),
 			'a',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -426,7 +426,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('x x', 0, 1, null, null),
 			'x x',
-			1, 1,
+			1, 1, true, false,
 			'x', 0
 		);
 	});
@@ -456,7 +456,7 @@ suite('TextAreaState', () => {
 				'some6  text',
 				'some7  text'
 			].join('\n'),
-			4, 4,
+			4, 4, true, false,
 			'📅', 0
 		);
 	});
@@ -470,7 +470,7 @@ suite('TextAreaState', () => {
 				null, null
 			),
 			'some💊1  text',
-			6, 6,
+			6, 6, true, false,
 			'💊', 0
 		);
 	});
@@ -484,7 +484,7 @@ suite('TextAreaState', () => {
 				null, null
 			),
 			'qwertyu\nasdfghj\nzxcvbnm🎈',
-			25, 25,
+			25, 25, true, false,
 			'🎈', 0
 		);
 	});
@@ -499,11 +499,25 @@ suite('TextAreaState', () => {
 				null, null
 			),
 			'some⌨️1  text',
-			6, 6,
+			6, 6, true, false,
 			'⌨️', 0
 		);
 	});
 
+	test('issue #42251: Minor issue, character swapped when typing', () => {
+		// Typing on OSX occurs at offset 0 after moving the window using the custom (non-native) titlebar.
+		testDeduceInput(
+			new TextAreaState(
+				'ab',
+				2, 2,
+				null, null
+			),
+			'cab',
+			1, 1, true, true,
+			'c', 0
+		);
+	});
+
 	suite('PagedScreenReaderStrategy', () => {
 
 		function testPagedScreenReaderStrategy(lines: string[], selection: Selection, expected: TextAreaState): void {

From b58f27d0cb8ab868526a38bb5bb935231a53a977 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 4 Apr 2018 12:12:45 +0200
Subject: [PATCH 319/383] Simplify ViewLineRenderingData (#22352)

---
 .../browser/viewParts/lines/viewLine.ts       | 12 +++-------
 .../common/viewLayout/viewLineRenderer.ts     | 16 +++++---------
 src/vs/editor/common/viewModel/viewModel.ts   | 22 ++++++++++++++-----
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 7a9761d20d8..13eb203b8db 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -6,7 +6,6 @@
 
 import * as browser from 'vs/base/browser/browser';
 import * as platform from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { IConfiguration } from 'vs/editor/common/editorCommon';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
@@ -192,7 +191,7 @@ export class ViewLine implements IVisibleLine {
 		let renderLineInput = new RenderLineInput(
 			options.useMonospaceOptimizations,
 			lineData.content,
-			lineData.mightContainRTL,
+			lineData.containsRTL,
 			lineData.minColumn - 1,
 			lineData.tokens,
 			actualInlineDecorations,
@@ -222,13 +221,8 @@ export class ViewLine implements IVisibleLine {
 		sb.appendASCIIString('</div>');
 
 		let renderedViewLine: IRenderedViewLine = null;
-		if (canUseFastRenderedViewLine && options.useMonospaceOptimizations && !output.containsForeignElements) {
-			let isRegularASCII = true;
-			if (lineData.mightContainNonBasicASCII) {
-				isRegularASCII = strings.isBasicASCII(lineData.content);
-			}
-
-			if (isRegularASCII && lineData.content.length < 1000 && renderLineInput.lineTokens.getCount() < 100) {
+		if (canUseFastRenderedViewLine && lineData.isBasicASCII && options.useMonospaceOptimizations && !output.containsForeignElements) {
+			if (lineData.content.length < 1000 && renderLineInput.lineTokens.getCount() < 100) {
 				// Browser rounding errors have been observed in Chrome and IE, so using the fast
 				// view line only for short lines. Please test before removing the length check...
 				// ---
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index a3c3bef72de..e959bc5f1c9 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -36,7 +36,7 @@ export class RenderLineInput {
 
 	public readonly useMonospaceOptimizations: boolean;
 	public readonly lineContent: string;
-	public readonly mightContainRTL: boolean;
+	public readonly containsRTL: boolean;
 	public readonly fauxIndentLength: number;
 	public readonly lineTokens: IViewLineTokens;
 	public readonly lineDecorations: LineDecoration[];
@@ -50,7 +50,7 @@ export class RenderLineInput {
 	constructor(
 		useMonospaceOptimizations: boolean,
 		lineContent: string,
-		mightContainRTL: boolean,
+		containsRTL: boolean,
 		fauxIndentLength: number,
 		lineTokens: IViewLineTokens,
 		lineDecorations: LineDecoration[],
@@ -63,7 +63,7 @@ export class RenderLineInput {
 	) {
 		this.useMonospaceOptimizations = useMonospaceOptimizations;
 		this.lineContent = lineContent;
-		this.mightContainRTL = mightContainRTL;
+		this.containsRTL = containsRTL;
 		this.fauxIndentLength = fauxIndentLength;
 		this.lineTokens = lineTokens;
 		this.lineDecorations = lineDecorations;
@@ -85,7 +85,7 @@ export class RenderLineInput {
 		return (
 			this.useMonospaceOptimizations === other.useMonospaceOptimizations
 			&& this.lineContent === other.lineContent
-			&& this.mightContainRTL === other.mightContainRTL
+			&& this.containsRTL === other.containsRTL
 			&& this.fauxIndentLength === other.fauxIndentLength
 			&& this.tabSize === other.tabSize
 			&& this.spaceWidth === other.spaceWidth
@@ -330,11 +330,7 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 		}
 		tokens = _applyInlineDecorations(lineContent, len, tokens, input.lineDecorations);
 	}
-	let containsRTL = false;
-	if (input.mightContainRTL) {
-		containsRTL = strings.containsRTL(lineContent);
-	}
-	if (!containsRTL && !input.fontLigatures) {
+	if (!input.containsRTL && !input.fontLigatures) {
 		tokens = splitLargeTokens(lineContent, tokens);
 	}
 
@@ -346,7 +342,7 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 		tokens,
 		containsForeignElements,
 		input.tabSize,
-		containsRTL,
+		input.containsRTL,
 		input.spaceWidth,
 		input.renderWhitespace,
 		input.renderControlCharacters
diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts
index 12766993b5d..857ea028fb3 100644
--- a/src/vs/editor/common/viewModel/viewModel.ts
+++ b/src/vs/editor/common/viewModel/viewModel.ts
@@ -15,6 +15,7 @@ import { Scrollable, IScrollPosition } from 'vs/base/common/scrollable';
 import { IPartialViewLinesViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
 import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer';
 import { ITheme } from 'vs/platform/theme/common/themeService';
+import * as strings from 'vs/base/common/strings';
 
 export interface IViewWhitespaceViewportData {
 	readonly id: number;
@@ -208,13 +209,13 @@ export class ViewLineRenderingData {
 	 */
 	public readonly content: string;
 	/**
-	 * If set to false, it is guaranteed that `content` contains only LTR chars.
+	 * Describes if `content` contains RTL characters.
 	 */
-	public readonly mightContainRTL: boolean;
+	public readonly containsRTL: boolean;
 	/**
-	 * If set to false, it is guaranteed that `content` contains only basic ASCII chars.
+	 * Describes if `content` contains non basic ASCII chars.
 	 */
-	public readonly mightContainNonBasicASCII: boolean;
+	public readonly isBasicASCII: boolean;
 	/**
 	 * The tokens at this view line.
 	 */
@@ -241,8 +242,17 @@ export class ViewLineRenderingData {
 		this.minColumn = minColumn;
 		this.maxColumn = maxColumn;
 		this.content = content;
-		this.mightContainRTL = mightContainRTL;
-		this.mightContainNonBasicASCII = mightContainNonBasicASCII;
+
+		this.isBasicASCII = true;
+		if (mightContainNonBasicASCII) {
+			this.isBasicASCII = strings.isBasicASCII(this.content);
+		}
+
+		this.containsRTL = false;
+		if (!this.isBasicASCII && mightContainRTL) {
+			this.containsRTL = strings.containsRTL(this.content);
+		}
+
 		this.tokens = tokens;
 		this.inlineDecorations = inlineDecorations;
 		this.tabSize = tabSize;

From 0f436b570009764ed6f3d480242d320d0470641b Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 4 Apr 2018 12:34:40 +0200
Subject: [PATCH 320/383] Add isBasicASCII to RenderLineInput (#22352)

---
 .../browser/viewParts/lines/viewLine.ts       |   1 +
 .../editor/browser/widget/diffEditorWidget.ts |   7 +-
 src/vs/editor/browser/widget/diffReview.ts    |   6 +-
 .../common/viewLayout/viewLineRenderer.ts     |   4 +
 src/vs/editor/common/viewModel/viewModel.ts   |  25 ++--
 src/vs/editor/standalone/browser/colorizer.ts |  20 +++-
 .../viewLayout/viewLineRenderer.test.ts       | 107 ++++++++++++++++++
 7 files changed, 153 insertions(+), 17 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 13eb203b8db..c1fa275be29 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -191,6 +191,7 @@ export class ViewLine implements IVisibleLine {
 		let renderLineInput = new RenderLineInput(
 			options.useMonospaceOptimizations,
 			lineData.content,
+			lineData.isBasicASCII,
 			lineData.containsRTL,
 			lineData.minColumn - 1,
 			lineData.tokens,
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index 294e27a714c..b823747dede 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -27,7 +27,7 @@ import { LineTokens } from 'vs/editor/common/core/lineTokens';
 import { Configuration } from 'vs/editor/browser/config/configuration';
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { Selection, ISelection } from 'vs/editor/common/core/selection';
-import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
+import { InlineDecoration, InlineDecorationType, ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ColorId, MetadataConsts, FontStyle } from 'vs/editor/common/modes';
 import { Event, Emitter } from 'vs/base/common/event';
@@ -1998,10 +1998,13 @@ class InlineViewZonesComputer extends ViewZonesComputer {
 		sb.appendASCIIString(String(count * config.lineHeight));
 		sb.appendASCIIString('px;width:1000000px;">');
 
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, originalModel.mightContainNonBasicASCII());
+		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, originalModel.mightContainRTL());
 		renderViewLine(new RenderLineInput(
 			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
 			lineContent,
-			originalModel.mightContainRTL(),
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens,
 			actualDecorations,
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
index 0f6af96eedd..7715c7482d7 100644
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ b/src/vs/editor/browser/widget/diffReview.ts
@@ -29,6 +29,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
+import { ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
 
 const DIFF_LINES_PADDING = 3;
 
@@ -738,10 +739,13 @@ export class DiffReview extends Disposable {
 
 		const lineTokens = new LineTokens(tokens, lineContent);
 
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, model.mightContainNonBasicASCII());
+		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
 		const r = renderViewLine(new RenderLineInput(
 			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
 			lineContent,
-			model.mightContainRTL(),
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens,
 			[],
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index e959bc5f1c9..e4ae47ae47d 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -36,6 +36,7 @@ export class RenderLineInput {
 
 	public readonly useMonospaceOptimizations: boolean;
 	public readonly lineContent: string;
+	public readonly isBasicASCII: boolean;
 	public readonly containsRTL: boolean;
 	public readonly fauxIndentLength: number;
 	public readonly lineTokens: IViewLineTokens;
@@ -50,6 +51,7 @@ export class RenderLineInput {
 	constructor(
 		useMonospaceOptimizations: boolean,
 		lineContent: string,
+		isBasicASCII: boolean,
 		containsRTL: boolean,
 		fauxIndentLength: number,
 		lineTokens: IViewLineTokens,
@@ -63,6 +65,7 @@ export class RenderLineInput {
 	) {
 		this.useMonospaceOptimizations = useMonospaceOptimizations;
 		this.lineContent = lineContent;
+		this.isBasicASCII = isBasicASCII;
 		this.containsRTL = containsRTL;
 		this.fauxIndentLength = fauxIndentLength;
 		this.lineTokens = lineTokens;
@@ -85,6 +88,7 @@ export class RenderLineInput {
 		return (
 			this.useMonospaceOptimizations === other.useMonospaceOptimizations
 			&& this.lineContent === other.lineContent
+			&& this.isBasicASCII === other.isBasicASCII
 			&& this.containsRTL === other.containsRTL
 			&& this.fauxIndentLength === other.fauxIndentLength
 			&& this.tabSize === other.tabSize
diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts
index 857ea028fb3..1702d8fd59f 100644
--- a/src/vs/editor/common/viewModel/viewModel.ts
+++ b/src/vs/editor/common/viewModel/viewModel.ts
@@ -243,20 +243,27 @@ export class ViewLineRenderingData {
 		this.maxColumn = maxColumn;
 		this.content = content;
 
-		this.isBasicASCII = true;
-		if (mightContainNonBasicASCII) {
-			this.isBasicASCII = strings.isBasicASCII(this.content);
-		}
-
-		this.containsRTL = false;
-		if (!this.isBasicASCII && mightContainRTL) {
-			this.containsRTL = strings.containsRTL(this.content);
-		}
+		this.isBasicASCII = ViewLineRenderingData.isBasicASCII(content, mightContainNonBasicASCII);
+		this.containsRTL = ViewLineRenderingData.containsRTL(content, this.isBasicASCII, mightContainRTL);
 
 		this.tokens = tokens;
 		this.inlineDecorations = inlineDecorations;
 		this.tabSize = tabSize;
 	}
+
+	public static isBasicASCII(lineContent: string, mightContainNonBasicASCII: boolean): boolean {
+		if (mightContainNonBasicASCII) {
+			return strings.isBasicASCII(lineContent);
+		}
+		return true;
+	}
+
+	public static containsRTL(lineContent: string, isBasicASCII: boolean, mightContainRTL: boolean): boolean {
+		if (!isBasicASCII && mightContainRTL) {
+			return strings.containsRTL(lineContent);
+		}
+		return false;
+	}
 }
 
 export const enum InlineDecorationType {
diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts
index 83603e32539..61e3b448392 100644
--- a/src/vs/editor/standalone/browser/colorizer.ts
+++ b/src/vs/editor/standalone/browser/colorizer.ts
@@ -13,6 +13,7 @@ import { renderViewLine2 as renderViewLine, RenderLineInput } from 'vs/editor/co
 import { LineTokens, IViewLineTokens } from 'vs/editor/common/core/lineTokens';
 import * as strings from 'vs/base/common/strings';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
+import { ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
 
 export interface IColorizerOptions {
 	tabSize?: number;
@@ -93,11 +94,14 @@ export class Colorizer {
 		});
 	}
 
-	public static colorizeLine(line: string, mightContainRTL: boolean, tokens: IViewLineTokens, tabSize: number = 4): string {
+	public static colorizeLine(line: string, mightContainNonBasicASCII: boolean, mightContainRTL: boolean, tokens: IViewLineTokens, tabSize: number = 4): string {
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(line, mightContainNonBasicASCII);
+		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, mightContainRTL);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
 			line,
-			mightContainRTL,
+			isBasicASCII,
+			containsRTL,
 			0,
 			tokens,
 			[],
@@ -116,7 +120,7 @@ export class Colorizer {
 		model.forceTokenization(lineNumber);
 		let tokens = model.getLineTokens(lineNumber);
 		let inflatedTokens = tokens.inflate();
-		return this.colorizeLine(content, model.mightContainRTL(), inflatedTokens, tabSize);
+		return this.colorizeLine(content, model.mightContainNonBasicASCII(), model.mightContainRTL(), inflatedTokens, tabSize);
 	}
 }
 
@@ -143,10 +147,13 @@ function _fakeColorize(lines: string[], tabSize: number): string {
 		tokens[0] = line.length;
 		const lineTokens = new LineTokens(tokens, line);
 
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(line, /* check for basic ASCII */true);
+		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, /* check for RTL */true);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
 			line,
-			false,
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens,
 			[],
@@ -174,10 +181,13 @@ function _actualColorize(lines: string[], tabSize: number, tokenizationSupport:
 		let tokenizeResult = tokenizationSupport.tokenize2(line, state, 0);
 		LineTokens.convertToEndOffset(tokenizeResult.tokens, line.length);
 		let lineTokens = new LineTokens(tokenizeResult.tokens, line);
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(line, /* check for basic ASCII */true);
+		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, /* check for RTL */true);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
 			line,
-			true/* check for RTL */,
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens.inflate(),
 			[],
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index b0214ecf8d9..f4db5c50977 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -12,6 +12,7 @@ import { MetadataConsts } from 'vs/editor/common/modes';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
 import { InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
 import { IViewLineTokens } from 'vs/editor/common/core/lineTokens';
+import * as strings from 'vs/base/common/strings';
 
 function createViewLineTokens(viewLineTokens: ViewLineToken[]): IViewLineTokens {
 	return new ViewLineTokens(viewLineTokens);
@@ -29,6 +30,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			strings.isBasicASCII(lineContent),
 			false,
 			0,
 			createViewLineTokens([new ViewLineToken(lineContent.length, 0)]),
@@ -75,6 +77,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens(parts),
@@ -111,6 +114,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			'Hello world!',
+			true,
 			false,
 			0,
 			createViewLineTokens([
@@ -212,6 +216,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			true,
 			false,
 			0,
 			lineParts,
@@ -271,6 +276,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			true,
 			false,
 			0,
 			lineParts,
@@ -330,6 +336,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			true,
 			false,
 			0,
 			lineParts,
@@ -366,6 +373,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			false,
 			true,
 			0,
 			lineParts,
@@ -393,6 +401,7 @@ suite('viewLineRenderer.renderLine', () => {
 			let actual = renderViewLine(new RenderLineInput(
 				false,
 				lineText,
+				true,
 				false,
 				0,
 				lineParts,
@@ -490,6 +499,7 @@ suite('viewLineRenderer.renderLine', () => {
 			let actual = renderViewLine(new RenderLineInput(
 				false,
 				lineText,
+				true,
 				false,
 				0,
 				lineParts,
@@ -524,6 +534,7 @@ suite('viewLineRenderer.renderLine', () => {
 			false,
 			lineText,
 			false,
+			false,
 			0,
 			lineParts,
 			[],
@@ -553,6 +564,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			false,
 			true,
 			0,
 			lineParts,
@@ -596,6 +608,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			true,
 			lineText,
+			true,
 			false,
 			4,
 			lineParts,
@@ -676,6 +689,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			fontIsMonospace,
 			lineContent,
+			true,
 			false,
 			fauxIndentLength,
 			createViewLineTokens(tokens),
@@ -698,6 +712,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(21, 3)]),
@@ -726,6 +741,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			true,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([
@@ -990,6 +1006,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			'Hello world',
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(11, 0)]),
@@ -1031,6 +1048,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(4, 3)]),
@@ -1060,6 +1078,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(4, 3)]),
@@ -1090,6 +1109,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(0, 3)]),
@@ -1117,6 +1137,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			true,
 			'  1. 🙏',
 			false,
+			false,
 			0,
 			createViewLineTokens([createPart(7, 3)]),
 			[new LineDecoration(7, 8, 'inline-folded', InlineDecorationType.After)],
@@ -1143,6 +1164,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			true,
 			'',
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(0, 3)]),
@@ -1172,6 +1194,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			true,
 			'\t}',
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(2, 3)]),
@@ -1203,6 +1226,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			true,
 			'asd = "擦"\t\t#asd',
 			false,
+			false,
 			0,
 			createViewLineTokens([createPart(15, 3)]),
 			[],
@@ -1229,6 +1253,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			true,
 			'asd = "擦"\t\t#asd',
 			false,
+			false,
 			0,
 			createViewLineTokens([createPart(15, 3)]),
 			[],
@@ -1255,10 +1280,92 @@ suite('viewLineRenderer.renderLine 2', () => {
 		assert.deepEqual(actual.html, expected);
 	});
 
+	// test('issue #22352: COMBINING ACUTE ACCENT (U+0301)', () => {
+
+	// 	let actual = renderViewLine(new RenderLineInput(
+	// 		true,
+	// 		'12345689012345678901234568901234567890123456890abába',
+	// 		false,
+	// 		false,
+	// 		0,
+	// 		createViewLineTokens([createPart(53, 3)]),
+	// 		[],
+	// 		4,
+	// 		10,
+	// 		10000,
+	// 		'none',
+	// 		false,
+	// 		false
+	// 	));
+
+	// 	let expected = [
+	// 		'<span>',
+	// 		'<span class="mtk3">12345689012345678901234568901234567890123456890abába</span>',
+	// 		'</span>'
+	// 	].join('');
+
+	// 	assert.deepEqual(actual.html, expected);
+	// });
+
+	// test('issue #22352: Partially Broken Complex Script Rendering of Tamil', () => {
+
+	// 	let actual = renderViewLine(new RenderLineInput(
+	// 		true,
+	// 		' JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்',
+	// 		false,
+	// 		false,
+	// 		0,
+	// 		createViewLineTokens([createPart(100, 3)]),
+	// 		[],
+	// 		4,
+	// 		10,
+	// 		10000,
+	// 		'none',
+	// 		false,
+	// 		false
+	// 	));
+
+	// 	let expected = [
+	// 		'<span>',
+	// 		'<span class="mtk3"> JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்</span>',
+	// 		'</span>'
+	// 	].join('');
+
+	// 	assert.deepEqual(actual.html, expected);
+	// });
+
+	// test('issue #42700: Hindi characters are not being rendered properly', () => {
+
+	// 	let actual = renderViewLine(new RenderLineInput(
+	// 		true,
+	// 		' वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।',
+	// 		false,
+	// 		false,
+	// 		0,
+	// 		createViewLineTokens([createPart(105, 3)]),
+	// 		[],
+	// 		4,
+	// 		10,
+	// 		10000,
+	// 		'none',
+	// 		false,
+	// 		false
+	// 	));
+
+	// 	let expected = [
+	// 		'<span>',
+	// 		'<span class="mtk3"> वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।</span>',
+	// 		'</span>'
+	// 	].join('');
+
+	// 	assert.deepEqual(actual.html, expected);
+	// });
+
 	function createTestGetColumnOfLinePartOffset(lineContent: string, tabSize: number, parts: ViewLineToken[], expectedPartLengths: number[]): (partIndex: number, partLength: number, offset: number, expected: number) => void {
 		let renderLineOutput = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens(parts),

From a8f068a5400b6b7907fa9763615e13e6de7f195d Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 4 Apr 2018 12:48:40 +0200
Subject: [PATCH 321/383] Fixes #22352: Only break long text into spans if it
 is basic ASCII

---
 .../common/viewLayout/viewLineRenderer.ts     |   7 +-
 .../viewLayout/viewLineRenderer.test.ts       | 148 +++++++++---------
 2 files changed, 75 insertions(+), 80 deletions(-)

diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index e4ae47ae47d..c6faa239326 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -334,7 +334,7 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 		}
 		tokens = _applyInlineDecorations(lineContent, len, tokens, input.lineDecorations);
 	}
-	if (!input.containsRTL && !input.fontLigatures) {
+	if (input.isBasicASCII && !input.fontLigatures) {
 		tokens = splitLargeTokens(lineContent, tokens);
 	}
 
@@ -406,11 +406,6 @@ function splitLargeTokens(lineContent: string, tokens: LinePart[]): LinePart[] {
 			const piecesCount = Math.ceil(diff / Constants.LongToken);
 			for (let j = 1; j < piecesCount; j++) {
 				let pieceEndIndex = lastTokenEndIndex + (j * Constants.LongToken);
-				let lastCharInPiece = lineContent.charCodeAt(pieceEndIndex - 1);
-				if (strings.isHighSurrogate(lastCharInPiece)) {
-					// Don't cut in the middle of a surrogate pair
-					pieceEndIndex--;
-				}
 				result[resultLen++] = new LinePart(pieceEndIndex, tokenType);
 			}
 			result[resultLen++] = new LinePart(tokenEndIndex, tokenType);
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index f4db5c50977..550eb85bf20 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -546,11 +546,7 @@ suite('viewLineRenderer.renderLine', () => {
 			false
 		));
 		let expectedOutput = [
-			'<span class="mtk1">a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
+			'<span class="mtk1">a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
 		];
 		assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>');
 	});
@@ -1280,86 +1276,90 @@ suite('viewLineRenderer.renderLine 2', () => {
 		assert.deepEqual(actual.html, expected);
 	});
 
-	// test('issue #22352: COMBINING ACUTE ACCENT (U+0301)', () => {
+	test('issue #22352: COMBINING ACUTE ACCENT (U+0301)', () => {
 
-	// 	let actual = renderViewLine(new RenderLineInput(
-	// 		true,
-	// 		'12345689012345678901234568901234567890123456890abába',
-	// 		false,
-	// 		false,
-	// 		0,
-	// 		createViewLineTokens([createPart(53, 3)]),
-	// 		[],
-	// 		4,
-	// 		10,
-	// 		10000,
-	// 		'none',
-	// 		false,
-	// 		false
-	// 	));
+		let actual = renderViewLine(new RenderLineInput(
+			true,
+			'12345689012345678901234568901234567890123456890abába',
+			false,
+			false,
+			0,
+			createViewLineTokens([createPart(53, 3)]),
+			[],
+			4,
+			10,
+			10000,
+			'none',
+			false,
+			false
+		));
 
-	// 	let expected = [
-	// 		'<span>',
-	// 		'<span class="mtk3">12345689012345678901234568901234567890123456890abába</span>',
-	// 		'</span>'
-	// 	].join('');
+		let expected = [
+			'<span>',
+			'<span class="mtk3">12345689012345678901234568901234567890123456890abába</span>',
+			'</span>'
+		].join('');
 
-	// 	assert.deepEqual(actual.html, expected);
-	// });
+		assert.deepEqual(actual.html, expected);
+	});
 
-	// test('issue #22352: Partially Broken Complex Script Rendering of Tamil', () => {
+	test('issue #22352: Partially Broken Complex Script Rendering of Tamil', () => {
 
-	// 	let actual = renderViewLine(new RenderLineInput(
-	// 		true,
-	// 		' JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்',
-	// 		false,
-	// 		false,
-	// 		0,
-	// 		createViewLineTokens([createPart(100, 3)]),
-	// 		[],
-	// 		4,
-	// 		10,
-	// 		10000,
-	// 		'none',
-	// 		false,
-	// 		false
-	// 	));
+		let actual = renderViewLine(new RenderLineInput(
+			true,
+			' JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்',
+			false,
+			false,
+			0,
+			createViewLineTokens([createPart(100, 3)]),
+			[],
+			4,
+			10,
+			10000,
+			'none',
+			false,
+			false
+		));
 
-	// 	let expected = [
-	// 		'<span>',
-	// 		'<span class="mtk3"> JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்</span>',
-	// 		'</span>'
-	// 	].join('');
+		let expected = [
+			'<span>',
+			'<span class="mtk3">\u00a0JoyShareல்\u00a0பின்தொடர்ந்து,\u00a0விடீயோ,\u00a0ஜோக்குகள்,\u00a0அனிமேசன்,\u00a0நகைச்சுவை\u00a0படங்கள்\u00a0மற்றும்\u00a0செய்திகளை\u00a0பெறுவீர்</span>',
+			'</span>'
+		].join('');
 
-	// 	assert.deepEqual(actual.html, expected);
-	// });
+		let _expected = expected.split('').map(c => c.charCodeAt(0));
+		let _actual = actual.html.split('').map(c => c.charCodeAt(0));
+		assert.deepEqual(_actual, _expected);
 
-	// test('issue #42700: Hindi characters are not being rendered properly', () => {
+		assert.deepEqual(actual.html, expected);
+	});
 
-	// 	let actual = renderViewLine(new RenderLineInput(
-	// 		true,
-	// 		' वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।',
-	// 		false,
-	// 		false,
-	// 		0,
-	// 		createViewLineTokens([createPart(105, 3)]),
-	// 		[],
-	// 		4,
-	// 		10,
-	// 		10000,
-	// 		'none',
-	// 		false,
-	// 		false
-	// 	));
+	test('issue #42700: Hindi characters are not being rendered properly', () => {
 
-	// 	let expected = [
-	// 		'<span>',
-	// 		'<span class="mtk3"> वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।</span>',
-	// 		'</span>'
-	// 	].join('');
+		let actual = renderViewLine(new RenderLineInput(
+			true,
+			' वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।',
+			false,
+			false,
+			0,
+			createViewLineTokens([createPart(105, 3)]),
+			[],
+			4,
+			10,
+			10000,
+			'none',
+			false,
+			false
+		));
 
-	// 	assert.deepEqual(actual.html, expected);
-	// });
+		let expected = [
+			'<span>',
+			'<span class="mtk3">\u00a0वो\u00a0ऐसा\u00a0क्या\u00a0है\u00a0जो\u00a0हमारे\u00a0अंदर\u00a0भी\u00a0है\u00a0और\u00a0बाहर\u00a0भी\u00a0है।\u00a0जिसकी\u00a0वजह\u00a0से\u00a0हम\u00a0सब\u00a0हैं।\u00a0जिसने\u00a0इस\u00a0सृष्टि\u00a0की\u00a0रचना\u00a0की\u00a0है।</span>',
+			'</span>'
+		].join('');
+
+		assert.deepEqual(actual.html, expected);
+	});
 
 	function createTestGetColumnOfLinePartOffset(lineContent: string, tabSize: number, parts: ViewLineToken[], expectedPartLengths: number[]): (partIndex: number, partLength: number, offset: number, expected: number) => void {
 		let renderLineOutput = renderViewLine(new RenderLineInput(

From 99b6b5d69385294050bf4436197819c101c37b3a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 4 Apr 2018 11:22:15 +0200
Subject: [PATCH 322/383] Change explorer model to a Map to fix #47120

---
 .../parts/files/common/explorerModel.ts       | 52 ++++++++++++-------
 .../electron-browser/views/explorerViewer.ts  | 10 ++--
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
index 6abc54c895a..e72ab77eb13 100644
--- a/src/vs/workbench/parts/files/common/explorerModel.ts
+++ b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -77,7 +77,7 @@ export class ExplorerItem {
 	public etag: string;
 	private _isDirectory: boolean;
 	private _isSymbolicLink: boolean;
-	private children: { [name: string]: ExplorerItem };
+	private children: Map<string, ExplorerItem>;
 	public parent: ExplorerItem;
 
 	public isDirectoryResolved: boolean;
@@ -109,7 +109,7 @@ export class ExplorerItem {
 		if (value !== this._isDirectory) {
 			this._isDirectory = value;
 			if (this._isDirectory) {
-				this.children = Object.create(null);
+				this.children = new Map<string, ExplorerItem>();
 			} else {
 				this.children = undefined;
 			}
@@ -185,18 +185,16 @@ export class ExplorerItem {
 			// Map resource => stat
 			const oldLocalChildren = new ResourceMap<ExplorerItem>();
 			if (local.children) {
-				for (let name in local.children) {
-					const child = local.children[name];
+				local.children.forEach(child => {
 					oldLocalChildren.set(child.resource, child);
-				}
+				});
 			}
 
 			// Clear current children
-			local.children = Object.create(null);
+			local.children = new Map<string, ExplorerItem>();
 
 			// Merge received children
-			for (let name in disk.children) {
-				const diskChild = disk.children[name];
+			disk.children.forEach(diskChild => {
 				const formerLocalChild = oldLocalChildren.get(diskChild.resource);
 				// Existing child: merge
 				if (formerLocalChild) {
@@ -210,7 +208,7 @@ export class ExplorerItem {
 					diskChild.parent = local;
 					local.addChild(diskChild);
 				}
-			}
+			});
 		}
 	}
 
@@ -223,7 +221,7 @@ export class ExplorerItem {
 		child.parent = this;
 		child.updateResource(false);
 
-		this.children[this.getPlatformAwareName(child.name)] = child;
+		this.children.set(this.getPlatformAwareName(child.name), child);
 	}
 
 	public getChild(name: string): ExplorerItem {
@@ -231,7 +229,7 @@ export class ExplorerItem {
 			return undefined;
 		}
 
-		return this.children[this.getPlatformAwareName(name)];
+		return this.children.get(this.getPlatformAwareName(name));
 	}
 
 	/**
@@ -242,7 +240,20 @@ export class ExplorerItem {
 			return undefined;
 		}
 
-		return Object.keys(this.children).map(name => this.children[name]);
+		const items: ExplorerItem[] = [];
+		this.children.forEach(child => {
+			items.push(child);
+		});
+
+		return items;
+	}
+
+	public getChildrenCount(): number {
+		if (!this.children) {
+			return 0;
+		}
+
+		return this.children.size;
 	}
 
 	public getChildrenNames(): string[] {
@@ -250,14 +261,19 @@ export class ExplorerItem {
 			return [];
 		}
 
-		return Object.keys(this.children);
+		const names: string[] = [];
+		this.children.forEach(child => {
+			names.push(child.name);
+		});
+
+		return names;
 	}
 
 	/**
 	 * Removes a child element from this folder.
 	 */
 	public removeChild(child: ExplorerItem): void {
-		delete this.children[this.getPlatformAwareName(child.name)];
+		this.children.delete(this.getPlatformAwareName(child.name));
 	}
 
 	private getPlatformAwareName(name: string): string {
@@ -289,9 +305,9 @@ export class ExplorerItem {
 
 		if (recursive) {
 			if (this.isDirectory && this.children) {
-				for (let name in this.children) {
-					this.children[name].updateResource(true);
-				}
+				this.children.forEach(child => {
+					child.updateResource(true);
+				});
 			}
 		}
 	}
@@ -347,7 +363,7 @@ export class ExplorerItem {
 			// The name to search is between two separators
 			const name = path.substring(index, indexOfNextSep);
 
-			const child = this.children[this.getPlatformAwareName(name)];
+			const child = this.children.get(this.getPlatformAwareName(name));
 
 			if (child) {
 				// We found a child with the given name, search inside it
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
index 60493bdca56..1d04e8a2165 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -694,13 +694,15 @@ export class FileFilter implements IFilter {
 		}
 
 		// Workaround for O(N^2) complexity (https://github.com/Microsoft/vscode/issues/9962)
-		let siblingNames = stat.parent && stat.parent.getChildrenNames();
-		if (siblingNames && siblingNames.length > FileFilter.MAX_SIBLINGS_FILTER_THRESHOLD) {
-			siblingNames = void 0;
+		let siblingsFn: () => string[];
+		let siblingCount = stat.parent && stat.parent.getChildrenCount();
+		if (siblingCount && siblingCount > FileFilter.MAX_SIBLINGS_FILTER_THRESHOLD) {
+			siblingsFn = () => void 0;
+		} else {
+			siblingsFn = () => stat.parent ? stat.parent.getChildrenNames() : void 0;
 		}
 
 		// Hide those that match Hidden Patterns
-		const siblingsFn = () => siblingNames;
 		const expression = this.hiddenExpressionPerRoot.get(stat.root.resource.toString()) || Object.create(null);
 		if (glob.match(expression, paths.normalize(relative(stat.root.resource.fsPath, stat.resource.fsPath), true), siblingsFn)) {
 			return false; // hidden through pattern

From a396179e23ab86bc13158d732c35f6e7532f942f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 4 Apr 2018 16:55:38 +0200
Subject: [PATCH 323/383] debt - notifications should talk about closing not
 disposal

---
 .../notification/common/notification.ts       | 22 ++++----
 .../mainThreadMessageService.ts               |  2 +-
 .../browser/parts/editor/editorPart.ts        |  2 +-
 .../notifications/notificationsCenter.ts      |  4 +-
 .../notifications/notificationsCommands.ts    |  2 +-
 .../notifications/notificationsToasts.ts      |  4 +-
 .../notifications/notificationsViewer.ts      |  2 +-
 src/vs/workbench/common/notifications.ts      | 50 +++++++++----------
 .../electron-browser/saveErrorHandler.ts      |  8 +--
 .../common/notificationService.ts             |  4 +-
 .../progress/browser/progressService2.ts      |  4 +-
 .../test/common/notifications.test.ts         | 10 ++--
 12 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
index 7f1c3d4c507..4b1315c077f 100644
--- a/src/vs/platform/notification/common/notification.ts
+++ b/src/vs/platform/notification/common/notification.ts
@@ -7,7 +7,6 @@
 
 import BaseSeverity from 'vs/base/common/severity';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
 import { IAction } from 'vs/base/common/actions';
 import { Event, Emitter } from 'vs/base/common/event';
 
@@ -89,12 +88,12 @@ export interface INotificationProgress {
 	done(): void;
 }
 
-export interface INotificationHandle extends IDisposable {
+export interface INotificationHandle {
 
 	/**
-	 * Will be fired once the notification is disposed.
+	 * Will be fired once the notification is closed.
 	 */
-	readonly onDidDispose: Event<void>;
+	readonly onDidClose: Event<void>;
 
 	/**
 	 * Allows to indicate progress on the notification even after the
@@ -118,6 +117,11 @@ export interface INotificationHandle extends IDisposable {
 	 * notification is already visible.
 	 */
 	updateActions(actions?: INotificationActions): void;
+
+	/**
+	 * Hide the notification and remove it from the notification center.
+	 */
+	close(): void;
 }
 
 export interface IPromptChoice {
@@ -199,18 +203,18 @@ export interface INotificationService {
 export class NoOpNotification implements INotificationHandle {
 	readonly progress = new NoOpProgress();
 
-	private readonly _onDidDispose: Emitter<void> = new Emitter();
+	private readonly _onDidClose: Emitter<void> = new Emitter();
 
-	public get onDidDispose(): Event<void> {
-		return this._onDidDispose.event;
+	public get onDidClose(): Event<void> {
+		return this._onDidClose.event;
 	}
 
 	updateSeverity(severity: Severity): void { }
 	updateMessage(message: NotificationMessage): void { }
 	updateActions(actions?: INotificationActions): void { }
 
-	dispose(): void {
-		this._onDidDispose.dispose();
+	close(): void {
+		this._onDidClose.dispose();
 	}
 }
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
index 016ebbf355a..92ca4c3cb44 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
@@ -92,7 +92,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 			// if promise has not been resolved yet, now is the time to ensure a return value
 			// otherwise if already resolved it means the user clicked one of the buttons
-			once(messageHandle.onDidDispose)(() => {
+			once(messageHandle.onDidClose)(() => {
 				dispose(...primaryActions, ...secondaryActions);
 				resolve(undefined);
 			});
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 246dc838d0e..22d490f27e1 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -559,7 +559,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 				actions
 			});
 
-			once(handle.onDidDispose)(() => dispose(actions.primary));
+			once(handle.onDidClose)(() => dispose(actions.primary));
 		}
 
 		this.editorGroupsControl.updateProgress(position, ProgressState.DONE);
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index fc2ac1dcbdb..50192e62212 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -289,9 +289,9 @@ export class NotificationsCenter extends Themable {
 		// Hide notifications center first
 		this.hide();
 
-		// Dispose all
+		// Close all
 		while (this.model.notifications.length) {
-			this.model.notifications[0].dispose();
+			this.model.notifications[0].close();
 		}
 	}
 }
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index 469360901d6..858f3bbe848 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -115,7 +115,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 		handler: (accessor, args?: any) => {
 			const notification = getNotificationFromContext(accessor.get(IListService), args);
 			if (notification) {
-				notification.dispose();
+				notification.close();
 			}
 		}
 	});
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 8c1fa51b1b3..f52e60460aa 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -168,8 +168,8 @@ export class NotificationsToasts extends Themable {
 			}
 		}));
 
-		// Remove when item gets disposed
-		once(item.onDidDispose)(() => {
+		// Remove when item gets closed
+		once(item.onDidClose)(() => {
 			this.removeToast(item);
 		});
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 124588a01cf..9cc3d416e22 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -442,7 +442,7 @@ export class NotificationTemplateRenderer {
 					this.actionRunner.run(action, notification);
 
 					// Hide notification
-					notification.dispose();
+					notification.close();
 				}));
 
 				this.inputDisposeables.push(attachButtonStyler(button, this.themeService));
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index 88fd2bc2e44..d27b8209c2b 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -44,21 +44,21 @@ export interface INotificationChangeEvent {
 }
 
 export class NotificationHandle implements INotificationHandle {
-	private readonly _onDidDispose: Emitter<void> = new Emitter();
+	private readonly _onDidClose: Emitter<void> = new Emitter();
 
-	constructor(private item: INotificationViewItem, private disposeItem: (item: INotificationViewItem) => void) {
+	constructor(private item: INotificationViewItem, private closeItem: (item: INotificationViewItem) => void) {
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		once(this.item.onDidDispose)(() => {
-			this._onDidDispose.fire();
-			this._onDidDispose.dispose();
+		once(this.item.onDidClose)(() => {
+			this._onDidClose.fire();
+			this._onDidClose.dispose();
 		});
 	}
 
-	public get onDidDispose(): Event<void> {
-		return this._onDidDispose.event;
+	public get onDidClose(): Event<void> {
+		return this._onDidClose.event;
 	}
 
 	public get progress(): INotificationProgress {
@@ -77,9 +77,9 @@ export class NotificationHandle implements INotificationHandle {
 		this.item.updateActions(actions);
 	}
 
-	public dispose(): void {
-		this.disposeItem(this.item);
-		this._onDidDispose.dispose();
+	public close(): void {
+		this.closeItem(this.item);
+		this._onDidClose.dispose();
 	}
 }
 
@@ -117,7 +117,7 @@ export class NotificationsModel implements INotificationsModel {
 		// Deduplicate
 		const duplicate = this.findNotification(item);
 		if (duplicate) {
-			duplicate.dispose();
+			duplicate.close();
 		}
 
 		// Add to list as first entry
@@ -127,15 +127,15 @@ export class NotificationsModel implements INotificationsModel {
 		this._onDidNotificationChange.fire({ item, index: 0, kind: NotificationChangeType.ADD });
 
 		// Wrap into handle
-		return new NotificationHandle(item, item => this.disposeItem(item));
+		return new NotificationHandle(item, item => this.closeItem(item));
 	}
 
-	private disposeItem(item: INotificationViewItem): void {
+	private closeItem(item: INotificationViewItem): void {
 		const liveItem = this.findNotification(item);
 		if (liveItem && liveItem !== item) {
-			liveItem.dispose(); // item could have been replaced with another one, make sure to dispose the live item
+			liveItem.close(); // item could have been replaced with another one, make sure to close the live item
 		} else {
-			item.dispose(); // otherwise just dispose the item that was passed in
+			item.close(); // otherwise just close the item that was passed in
 		}
 	}
 
@@ -174,7 +174,7 @@ export class NotificationsModel implements INotificationsModel {
 			}
 		});
 
-		once(item.onDidDispose)(() => {
+		once(item.onDidClose)(() => {
 			itemExpansionChangeListener.dispose();
 			itemLabelChangeListener.dispose();
 
@@ -204,7 +204,7 @@ export interface INotificationViewItem {
 	readonly canCollapse: boolean;
 
 	readonly onDidExpansionChange: Event<void>;
-	readonly onDidDispose: Event<void>;
+	readonly onDidClose: Event<void>;
 	readonly onDidLabelChange: Event<INotificationViewItemLabelChangeEvent>;
 
 	expand(): void;
@@ -217,7 +217,7 @@ export interface INotificationViewItem {
 	updateMessage(message: NotificationMessage): void;
 	updateActions(actions?: INotificationActions): void;
 
-	dispose(): void;
+	close(): void;
 
 	equals(item: INotificationViewItem);
 }
@@ -359,7 +359,7 @@ export class NotificationViewItem implements INotificationViewItem {
 	private _progress: NotificationViewItemProgress;
 
 	private readonly _onDidExpansionChange: Emitter<void>;
-	private readonly _onDidDispose: Emitter<void>;
+	private readonly _onDidClose: Emitter<void>;
 	private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent>;
 
 	public static create(notification: INotification): INotificationViewItem {
@@ -435,8 +435,8 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._onDidLabelChange = new Emitter<INotificationViewItemLabelChangeEvent>();
 		this.toDispose.push(this._onDidLabelChange);
 
-		this._onDidDispose = new Emitter<void>();
-		this.toDispose.push(this._onDidDispose);
+		this._onDidClose = new Emitter<void>();
+		this.toDispose.push(this._onDidClose);
 	}
 
 	private setActions(actions: INotificationActions): void {
@@ -464,8 +464,8 @@ export class NotificationViewItem implements INotificationViewItem {
 		return this._onDidLabelChange.event;
 	}
 
-	public get onDidDispose(): Event<void> {
-		return this._onDidDispose.event;
+	public get onDidClose(): Event<void> {
+		return this._onDidClose.event;
 	}
 
 	public get canCollapse(): boolean {
@@ -556,8 +556,8 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 	}
 
-	public dispose(): void {
-		this._onDidDispose.fire();
+	public close(): void {
+		this._onDidClose.fire();
 
 		this.toDispose = dispose(this.toDispose);
 	}
diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
index 56bf6d7a656..8ddc5c94b45 100644
--- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
@@ -102,7 +102,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 	private onFileSavedOrReverted(resource: URI): void {
 		const messageHandle = this.messages.get(resource);
 		if (messageHandle) {
-			messageHandle.dispose();
+			messageHandle.close();
 			this.messages.delete(resource);
 		}
 	}
@@ -179,7 +179,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 
 		// Show message and keep function to hide in case the file gets saved/reverted
 		const handle = this.notificationService.notify({ severity: Severity.Error, message, actions });
-		once(handle.onDidDispose)(() => dispose(...actions.primary, ...actions.secondary));
+		once(handle.onDidClose)(() => dispose(...actions.primary, ...actions.secondary));
 		this.messages.set(model.getResource(), handle);
 	}
 
@@ -193,7 +193,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 const pendingResolveSaveConflictMessages: INotificationHandle[] = [];
 function clearPendingResolveSaveConflictMessages(): void {
 	while (pendingResolveSaveConflictMessages.length > 0) {
-		pendingResolveSaveConflictMessages.pop().dispose();
+		pendingResolveSaveConflictMessages.pop().close();
 	}
 }
 
@@ -265,7 +265,7 @@ class ResolveSaveConflictAction extends Action {
 				actions.secondary.push(this.instantiationService.createInstance(DoNotShowResolveConflictLearnMoreAction));
 
 				const handle = this.notificationService.notify({ severity: Severity.Info, message: conflictEditorHelp, actions });
-				once(handle.onDidDispose)(() => dispose(...actions.primary, ...actions.secondary));
+				once(handle.onDidClose)(() => dispose(...actions.primary, ...actions.secondary));
 				pendingResolveSaveConflictMessages.push(handle);
 			});
 		}
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index d2cd39a8132..52fbfe0638c 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -80,7 +80,7 @@ export class NotificationService implements INotificationService {
 
 				// Close notification unless we are told to keep open
 				if (!choice.keepOpen) {
-					handle.dispose();
+					handle.close();
 				}
 
 				return TPromise.as(void 0);
@@ -96,7 +96,7 @@ export class NotificationService implements INotificationService {
 		// Show notification with actions
 		handle = this.notify({ severity, message, actions });
 
-		once(handle.onDidDispose)(() => {
+		once(handle.onDidClose)(() => {
 
 			// Cleanup when notification gets disposed
 			dispose(...actions.primary, ...actions.secondary);
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index 7f58433b7c2..876dd549910 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -203,7 +203,7 @@ export class ProgressService2 implements IProgressService2 {
 
 			updateProgress(handle, increment);
 
-			once(handle.onDidDispose)(() => {
+			once(handle.onDidClose)(() => {
 				dispose(toDispose);
 			});
 
@@ -247,7 +247,7 @@ export class ProgressService2 implements IProgressService2 {
 		// Show progress for at least 800ms and then hide once done or canceled
 		always(TPromise.join([TPromise.timeout(800), p]), () => {
 			if (handle) {
-				handle.dispose();
+				handle.close();
 			}
 		});
 
diff --git a/src/vs/workbench/test/common/notifications.test.ts b/src/vs/workbench/test/common/notifications.test.ts
index 533cc9ae266..fc7699a81f1 100644
--- a/src/vs/workbench/test/common/notifications.test.ts
+++ b/src/vs/workbench/test/common/notifications.test.ts
@@ -96,11 +96,11 @@ suite('Notifications', () => {
 		assert.equal(called, 1);
 
 		called = 0;
-		item1.onDidDispose(() => {
+		item1.onDidClose(() => {
 			called++;
 		});
 
-		item1.dispose();
+		item1.close();
 		assert.equal(called, 1);
 
 		// Error with Action
@@ -157,11 +157,11 @@ suite('Notifications', () => {
 		assert.equal(model.notifications.length, 3);
 
 		let called = 0;
-		item1Handle.onDidDispose(() => {
+		item1Handle.onDidClose(() => {
 			called++;
 		});
 
-		item1Handle.dispose();
+		item1Handle.close();
 		assert.equal(called, 1);
 		assert.equal(model.notifications.length, 2);
 		assert.equal(lastEvent.item.severity, item1.severity);
@@ -176,7 +176,7 @@ suite('Notifications', () => {
 		assert.equal(lastEvent.index, 0);
 		assert.equal(lastEvent.kind, NotificationChangeType.ADD);
 
-		item2Handle.dispose();
+		item2Handle.close();
 		assert.equal(model.notifications.length, 1);
 		assert.equal(lastEvent.item.severity, item2Duplicate.severity);
 		assert.equal(lastEvent.item.message.value, item2Duplicate.message);

From a2765bf43a5b196b437c6e6e803430ae336e719c Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 4 Apr 2018 17:54:48 +0200
Subject: [PATCH 324/383] Implement #46750 - Introduce Application scope -
 Update configuration service and models to respect the application scope -
 Update settings editor to respect the application scope

---
 .../common/configurationRegistry.ts           | 42 +++++++---
 .../preferences/browser/preferencesEditor.ts  | 15 +++-
 .../browser/preferencesRenderers.ts           | 44 +----------
 .../preferences/browser/preferencesService.ts | 79 ++++++++++++-------
 .../preferences/common/preferencesModels.ts   | 16 ++--
 .../common/configurationModels.ts             |  7 +-
 .../configuration/node/configuration.ts       |  2 +-
 .../node/configurationEditingService.ts       | 15 ++++
 .../node/configurationService.ts              | 32 ++++++--
 .../test/common/configurationModels.test.ts   |  6 +-
 .../test/node/configurationService.test.ts    | 43 +++++++++-
 11 files changed, 194 insertions(+), 107 deletions(-)

diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index 1db8bcc8ff4..1227443eaf4 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -11,7 +11,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import * as types from 'vs/base/common/types';
 import * as strings from 'vs/base/common/strings';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { deepClone } from 'vs/base/common/objects';
 
 export const Extensions = {
 	Configuration: 'base.contributions.configuration'
@@ -63,8 +62,9 @@ export interface IConfigurationRegistry {
 }
 
 export enum ConfigurationScope {
-	WINDOW = 1,
-	RESOURCE
+	APPLICATION = 1,
+	WINDOW,
+	RESOURCE,
 }
 
 export interface IConfigurationPropertySchema extends IJSONSchema {
@@ -93,8 +93,10 @@ export interface IDefaultConfigurationExtension {
 	defaults: { [key: string]: {} };
 }
 
-export const settingsSchema: IJSONSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
-export const resourceSettingsSchema: IJSONSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+export const allSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
+export const applicationSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
+export const windowSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
+export const resourceSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
 
 export const editorConfigurationSchemaId = 'vscode://schemas/settings/editor';
 const contributionRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
@@ -239,10 +241,17 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			let properties = configuration.properties;
 			if (properties) {
 				for (let key in properties) {
-					settingsSchema.properties[key] = properties[key];
-					resourceSettingsSchema.properties[key] = deepClone(properties[key]);
-					if (properties[key].scope !== ConfigurationScope.RESOURCE) {
-						resourceSettingsSchema.properties[key].doNotSuggest = true;
+					allSettings.properties[key] = properties[key];
+					switch (properties[key].scope) {
+						case ConfigurationScope.APPLICATION:
+							applicationSettings.properties[key] = properties[key];
+							break;
+						case ConfigurationScope.WINDOW:
+							windowSettings.properties[key] = properties[key];
+							break;
+						case ConfigurationScope.RESOURCE:
+							resourceSettings.properties[key] = properties[key];
+							break;
 					}
 				}
 			}
@@ -262,7 +271,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	private updateOverridePropertyPatternKey(): void {
-		let patternProperties: IJSONSchema = settingsSchema.patternProperties[this.overridePropertyPattern];
+		let patternProperties: IJSONSchema = allSettings.patternProperties[this.overridePropertyPattern];
 		if (!patternProperties) {
 			patternProperties = {
 				type: 'object',
@@ -271,11 +280,18 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 				$ref: editorConfigurationSchemaId
 			};
 		}
-		delete settingsSchema.patternProperties[this.overridePropertyPattern];
+
+		delete allSettings.patternProperties[this.overridePropertyPattern];
+		delete applicationSettings.patternProperties[this.overridePropertyPattern];
+		delete windowSettings.patternProperties[this.overridePropertyPattern];
+		delete resourceSettings.patternProperties[this.overridePropertyPattern];
+
 		this.computeOverridePropertyPattern();
 
-		settingsSchema.patternProperties[this.overridePropertyPattern] = patternProperties;
-		resourceSettingsSchema.patternProperties[this.overridePropertyPattern] = patternProperties;
+		allSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+		applicationSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+		windowSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+		resourceSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
 	}
 
 	private update(configuration: IConfigurationNode): void {
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 70c4761e517..fb19dd05d4d 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -57,7 +57,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { MessageController } from 'vs/editor/contrib/message/messageController';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -848,11 +847,23 @@ class SideBySidePreferencesWidget extends Widget {
 		return TPromise.join([this.updateInput(this.defaultPreferencesEditor, defaultPreferencesEditorInput, DefaultSettingsEditorContribution.ID, editablePreferencesEditorInput.getResource(), options),
 		this.updateInput(this.editablePreferencesEditor, editablePreferencesEditorInput, SettingsEditorContribution.ID, defaultPreferencesEditorInput.getResource(), options)])
 			.then(([defaultPreferencesRenderer, editablePreferencesRenderer]) => {
-				this.defaultPreferencesHeader.textContent = defaultPreferencesRenderer && (<DefaultSettingsEditorModel>defaultPreferencesRenderer.preferencesModel).configurationScope === ConfigurationScope.RESOURCE ? nls.localize('defaultFolderSettings', "Default Folder Settings") : nls.localize('defaultSettings', "Default Settings");
+				this.defaultPreferencesHeader.textContent = defaultPreferencesRenderer && this.getDefaultPreferencesHeaderText((<DefaultSettingsEditorModel>defaultPreferencesRenderer.preferencesModel).target);
 				return { defaultPreferencesRenderer, editablePreferencesRenderer };
 			});
 	}
 
+	private getDefaultPreferencesHeaderText(target: ConfigurationTarget): string {
+		switch (target) {
+			case ConfigurationTarget.USER:
+				return nls.localize('defaultUserSettings', "Default User Settings");
+			case ConfigurationTarget.WORKSPACE:
+				return nls.localize('defaultWorkspaceSettings', "Default Workspace Settings");
+			case ConfigurationTarget.WORKSPACE_FOLDER:
+				return nls.localize('defaultFolderSettings', "Default Folder Settings");
+		}
+		return '';
+	}
+
 	public setResultCount(settingsTarget: SettingsTarget, count: number): void {
 		this.settingsTargetsWidget.setResultCount(settingsTarget, count);
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 20e9351d138..6f134ab7bc9 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -29,7 +29,6 @@ import { IMarkerService, IMarkerData, MarkerSeverity } from 'vs/platform/markers
 import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { MarkdownString } from 'vs/base/common/htmlContent';
 import { overrideIdentifierFromKey, IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITextModel, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
@@ -273,7 +272,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 	) {
 		super();
 		this.settingHighlighter = this._register(instantiationService.createInstance(SettingHighlighter, editor, this._onFocusPreference, this._onClearFocusPreference));
-		this.settingsHeaderRenderer = this._register(instantiationService.createInstance(DefaultSettingsHeaderRenderer, editor, preferencesModel.configurationScope));
+		this.settingsHeaderRenderer = this._register(instantiationService.createInstance(DefaultSettingsHeaderRenderer, editor));
 		this.settingsGroupTitleRenderer = this._register(instantiationService.createInstance(SettingsGroupTitleRenderer, editor));
 		this.filteredMatchesRenderer = this._register(instantiationService.createInstance(FilteredMatchesRenderer, editor));
 		this.editSettingActionRenderer = this._register(instantiationService.createInstance(EditSettingRenderer, editor, preferencesModel, this.settingHighlighter));
@@ -467,7 +466,7 @@ class DefaultSettingsHeaderRenderer extends Disposable {
 	private settingsHeaderWidget: DefaultSettingsHeaderWidget;
 	public readonly onClick: Event<void>;
 
-	constructor(editor: ICodeEditor, scope: ConfigurationScope) {
+	constructor(editor: ICodeEditor) {
 		super();
 		this.settingsHeaderWidget = this._register(new DefaultSettingsHeaderWidget(editor, ''));
 		this.onClick = this.settingsHeaderWidget.onClick;
@@ -1312,14 +1311,12 @@ class SettingHighlighter extends Disposable {
 
 class UnsupportedSettingsRenderer extends Disposable {
 
-	private decorationIds: string[] = [];
 	private renderingDelayer: Delayer<void> = new Delayer<void>(200);
 
 	constructor(
 		private editor: ICodeEditor,
 		private settingsEditorModel: SettingsEditorModel,
-		@IMarkerService private markerService: IMarkerService,
-		@IEnvironmentService private environmentService: IEnvironmentService
+		@IMarkerService private markerService: IMarkerService
 	) {
 		super();
 		this._register(this.editor.getModel().onDidChangeContent(() => this.renderingDelayer.trigger(() => this.render())));
@@ -1327,7 +1324,6 @@ class UnsupportedSettingsRenderer extends Disposable {
 
 	public render(): void {
 		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
-		const ranges: IRange[] = [];
 		const markerData: IMarkerData[] = [];
 		for (const settingsGroup of this.settingsEditorModel.settingsGroups) {
 			for (const section of settingsGroup.sections) {
@@ -1345,17 +1341,6 @@ class UnsupportedSettingsRenderer extends Disposable {
 							});
 						}
 					}
-					if (this.settingsEditorModel.configurationTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
-						// Dim and show information for window settings
-						if (configurationRegistry[setting.key] && configurationRegistry[setting.key].scope === ConfigurationScope.WINDOW) {
-							ranges.push({
-								startLineNumber: setting.keyRange.startLineNumber,
-								startColumn: setting.keyRange.startColumn - 1,
-								endLineNumber: setting.valueRange.endLineNumber,
-								endColumn: setting.valueRange.endColumn
-							});
-						}
-					}
 				}
 			}
 		}
@@ -1364,14 +1349,6 @@ class UnsupportedSettingsRenderer extends Disposable {
 		} else {
 			this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
 		}
-		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));
-	}
-
-	private createDecoration(range: IRange, model: ITextModel): IModelDeltaDecoration {
-		return {
-			range,
-			options: !this.environmentService.isBuilt || this.environmentService.isExtensionDevelopment ? UnsupportedSettingsRenderer._DIM_CONFIGUARATION_DEV_MODE : UnsupportedSettingsRenderer._DIM_CONFIGUARATION_
-		};
 	}
 
 	private getMarkerMessage(settingKey: string): string {
@@ -1385,23 +1362,8 @@ class UnsupportedSettingsRenderer extends Disposable {
 
 	public dispose(): void {
 		this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
-		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
-
-	private static readonly _DIM_CONFIGUARATION_ = ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		inlineClassName: 'dim-configuration',
-		beforeContentClassName: 'unsupportedWorkbenhSettingInfo',
-		hoverMessage: new MarkdownString().appendText(nls.localize('unsupportedWorkbenchSetting', "This setting cannot be applied now. It will be applied when you open this folder directly."))
-	});
-
-	private static readonly _DIM_CONFIGUARATION_DEV_MODE = ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		inlineClassName: 'dim-configuration',
-		beforeContentClassName: 'unsupportedWorkbenhSettingInfo',
-		hoverMessage: new MarkdownString().appendText(nls.localize('unsupportedWorkbenchSettingDevMode', "This setting cannot be applied now. It will be applied if you define it's scope as 'resource' while registering, or when you open this folder directly."))
-	});
 }
 
 class WorkspaceConfigurationRenderer extends Disposable {
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
index c569308d4e8..f453fce8e0d 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
@@ -34,7 +34,6 @@ import { Position, IPosition } from 'vs/editor/common/core/position';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { parse } from 'vs/base/common/json';
@@ -51,10 +50,12 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	private readonly _onDispose: Emitter<void> = new Emitter<void>();
 
-	private _defaultSettingsUriCounter = 0;
-	private _defaultSettingsContentModel: DefaultSettings;
-	private _defaultResourceSettingsUriCounter = 0;
-	private _defaultResourceSettingsContentModel: DefaultSettings;
+	private _defaultUserSettingsUriCounter = 0;
+	private _defaultUserSettingsContentModel: DefaultSettings;
+	private _defaultWorkspaceSettingsUriCounter = 0;
+	private _defaultWorkspaceSettingsContentModel: DefaultSettings;
+	private _defaultFolderSettingsUriCounter = 0;
+	private _defaultFolderSettingsContentModel: DefaultSettings;
 
 	constructor(
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@@ -108,9 +109,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	resolveModel(uri: URI): TPromise<ITextModel> {
-		if (this.isDefaultSettingsResource(uri) || this.isDefaultResourceSettingsResource(uri)) {
+		if (this.isDefaultSettingsResource(uri)) {
 
-			const scope = this.isDefaultSettingsResource(uri) ? ConfigurationScope.WINDOW : ConfigurationScope.RESOURCE;
+			const target = this.getConfigurationTargetFromDefaultSettingsResource(uri);
 			const mode = this.modeService.getOrCreateMode('jsonc');
 			const model = this._register(this.modelService.createModel('', mode, uri));
 
@@ -122,7 +123,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 						// model has not been given out => nothing to do
 						return;
 					}
-					defaultSettings = this.getDefaultSettings(scope);
+					defaultSettings = this.getDefaultSettings(target);
 					this.modelService.updateModel(model, defaultSettings.parse());
 					defaultSettings._onDidChange.fire();
 				}
@@ -130,7 +131,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 			// Check if Default settings is already created and updated in above promise
 			if (!defaultSettings) {
-				defaultSettings = this.getDefaultSettings(scope);
+				defaultSettings = this.getDefaultSettings(target);
 				this.modelService.updateModel(model, defaultSettings.parse());
 			}
 
@@ -138,7 +139,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		}
 
 		if (this.defaultSettingsRawResource.toString() === uri.toString()) {
-			let defaultSettings: DefaultSettings = this.getDefaultSettings(ConfigurationScope.WINDOW);
+			let defaultSettings: DefaultSettings = this.getDefaultSettings(ConfigurationTarget.USER);
 			const mode = this.modeService.getOrCreateMode('jsonc');
 			const model = this._register(this.modelService.createModel(defaultSettings.raw, mode, uri));
 			return TPromise.as(model);
@@ -155,7 +156,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	createPreferencesEditorModel(uri: URI): TPromise<IPreferencesEditorModel<any>> {
-		if (this.isDefaultSettingsResource(uri) || this.isDefaultResourceSettingsResource(uri)) {
+		if (this.isDefaultSettingsResource(uri)) {
 			return this.createDefaultSettingsEditorModel(uri);
 		}
 
@@ -271,20 +272,34 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			});
 	}
 
+	private getConfigurationTargetFromDefaultSettingsResource(uri: URI) {
+		return this.isDefaultWorkspaceSettingsResource(uri) ? ConfigurationTarget.WORKSPACE : this.isDefaultFolderSettingsResource(uri) ? ConfigurationTarget.WORKSPACE_FOLDER : ConfigurationTarget.USER;
+	}
+
 	private isDefaultSettingsResource(uri: URI): boolean {
+		return this.isDefaultUserSettingsResource(uri) || this.isDefaultWorkspaceSettingsResource(uri) || this.isDefaultFolderSettingsResource(uri);
+	}
+
+	private isDefaultUserSettingsResource(uri: URI): boolean {
 		return uri.authority === 'defaultsettings' && uri.scheme === network.Schemas.vscode && !!uri.path.match(/\/(\d+\/)?settings\.json$/);
 	}
 
-	private isDefaultResourceSettingsResource(uri: URI): boolean {
+	private isDefaultWorkspaceSettingsResource(uri: URI): boolean {
+		return uri.authority === 'defaultsettings' && uri.scheme === network.Schemas.vscode && !!uri.path.match(/\/(\d+\/)?workspaceSettings\.json$/);
+	}
+
+	private isDefaultFolderSettingsResource(uri: URI): boolean {
 		return uri.authority === 'defaultsettings' && uri.scheme === network.Schemas.vscode && !!uri.path.match(/\/(\d+\/)?resourceSettings\.json$/);
 	}
 
 	private getDefaultSettingsResource(configurationTarget: ConfigurationTarget): URI {
-		if (configurationTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
-			return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultResourceSettingsUriCounter++}/resourceSettings.json` });
-		} else {
-			return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultSettingsUriCounter++}/settings.json` });
+		switch (configurationTarget) {
+			case ConfigurationTarget.WORKSPACE:
+				return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultWorkspaceSettingsUriCounter++}/workspaceSettings.json` });
+			case ConfigurationTarget.WORKSPACE_FOLDER:
+				return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultFolderSettingsUriCounter++}/resourceSettings.json` });
 		}
+		return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultUserSettingsUriCounter++}/settings.json` });
 	}
 
 	private getPreferencesEditorInputName(target: ConfigurationTarget, resource: URI): string {
@@ -314,24 +329,28 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	private createDefaultSettingsEditorModel(defaultSettingsUri: URI): TPromise<DefaultSettingsEditorModel> {
 		return this.textModelResolverService.createModelReference(defaultSettingsUri)
 			.then(reference => {
-				const scope = this.isDefaultSettingsResource(defaultSettingsUri) ? ConfigurationScope.WINDOW : ConfigurationScope.RESOURCE;
-				return this.instantiationService.createInstance(DefaultSettingsEditorModel, defaultSettingsUri, reference, scope, this.getDefaultSettings(scope));
+				const target = this.getConfigurationTargetFromDefaultSettingsResource(defaultSettingsUri);
+				return this.instantiationService.createInstance(DefaultSettingsEditorModel, defaultSettingsUri, reference, this.getDefaultSettings(target));
 			});
 	}
 
-	private getDefaultSettings(scope: ConfigurationScope): DefaultSettings {
-		switch (scope) {
-			case ConfigurationScope.WINDOW:
-				if (!this._defaultSettingsContentModel) {
-					this._defaultSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), scope);
-				}
-				return this._defaultSettingsContentModel;
-			case ConfigurationScope.RESOURCE:
-				if (!this._defaultResourceSettingsContentModel) {
-					this._defaultResourceSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), scope);
-				}
-				return this._defaultResourceSettingsContentModel;
+	private getDefaultSettings(target: ConfigurationTarget): DefaultSettings {
+		if (target === ConfigurationTarget.WORKSPACE) {
+			if (!this._defaultWorkspaceSettingsContentModel) {
+				this._defaultWorkspaceSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), target);
+			}
+			return this._defaultWorkspaceSettingsContentModel;
 		}
+		if (target === ConfigurationTarget.WORKSPACE_FOLDER) {
+			if (!this._defaultFolderSettingsContentModel) {
+				this._defaultFolderSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), target);
+			}
+			return this._defaultFolderSettingsContentModel;
+		}
+		if (!this._defaultUserSettingsContentModel) {
+			this._defaultUserSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), target);
+		}
+		return this._defaultUserSettingsContentModel;
 	}
 
 	private getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): URI {
diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
index 3119e7a4b16..8decbe43134 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
@@ -403,7 +403,7 @@ export class DefaultSettings extends Disposable {
 
 	constructor(
 		private _mostCommonlyUsedSettingsKeys: string[],
-		readonly configurationScope: ConfigurationScope,
+		readonly target: ConfigurationTarget,
 	) {
 		super();
 	}
@@ -555,10 +555,13 @@ export class DefaultSettings extends Disposable {
 	}
 
 	private matchesScope(property: IConfigurationNode): boolean {
-		if (this.configurationScope === ConfigurationScope.WINDOW) {
-			return true;
+		if (this.target === ConfigurationTarget.WORKSPACE_FOLDER) {
+			return property.scope === ConfigurationScope.RESOURCE;
 		}
-		return property.scope === this.configurationScope;
+		if (this.target === ConfigurationTarget.WORKSPACE) {
+			return property.scope === ConfigurationScope.WINDOW || property.scope === ConfigurationScope.RESOURCE;
+		}
+		return true;
 	}
 
 	private compareConfigurationNodes(c1: IConfigurationNode, c2: IConfigurationNode): number {
@@ -603,7 +606,6 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 	constructor(
 		private _uri: URI,
 		reference: IReference<ITextEditorModel>,
-		readonly configurationScope: ConfigurationScope,
 		private readonly defaultSettings: DefaultSettings
 	) {
 		super();
@@ -617,6 +619,10 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 		return this._uri;
 	}
 
+	public get target(): ConfigurationTarget {
+		return this.defaultSettings.target;
+	}
+
 	public get settingsGroups(): ISettingsGroup[] {
 		return this.defaultSettings.settingsGroups;
 	}
diff --git a/src/vs/workbench/services/configuration/common/configurationModels.ts b/src/vs/workbench/services/configuration/common/configurationModels.ts
index 27be593edfe..9550abcf826 100644
--- a/src/vs/workbench/services/configuration/common/configurationModels.ts
+++ b/src/vs/workbench/services/configuration/common/configurationModels.ts
@@ -37,7 +37,7 @@ export class WorkspaceConfigurationModelParser extends ConfigurationModelParser
 
 	constructor(name: string) {
 		super(name);
-		this._settingsModelParser = new FolderSettingsModelParser(name);
+		this._settingsModelParser = new FolderSettingsModelParser(name, [ConfigurationScope.WINDOW, ConfigurationScope.RESOURCE]);
 		this._launchModel = new ConfigurationModel();
 	}
 
@@ -98,7 +98,7 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 	private _raw: any;
 	private _settingsModel: SettingsModel;
 
-	constructor(name: string, private configurationScope?: ConfigurationScope) {
+	constructor(name: string, private scopes: ConfigurationScope[]) {
 		super(name);
 	}
 
@@ -125,7 +125,8 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
 		for (let key in rawSettings) {
 			if (this.isNotExecutable(key, configurationProperties)) {
-				if (this.configurationScope === void 0 || this.getScope(key, configurationProperties) === this.configurationScope) {
+				const scope = this.getScope(key, configurationProperties);
+				if (this.scopes.indexOf(scope) !== -1) {
 					rawWorkspaceSettings[key] = rawSettings[key];
 				}
 			} else {
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index 70082cd28ba..0d7fbcbb8eb 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -187,7 +187,7 @@ export class FolderConfiguration extends Disposable {
 	constructor(private folder: URI, private configFolderRelativePath: string, workbenchState: WorkbenchState) {
 		super();
 
-		this._folderSettingsModelParser = new FolderSettingsModelParser(FOLDER_SETTINGS_PATH, WorkbenchState.WORKSPACE === workbenchState ? ConfigurationScope.RESOURCE : void 0);
+		this._folderSettingsModelParser = new FolderSettingsModelParser(FOLDER_SETTINGS_PATH, WorkbenchState.WORKSPACE === workbenchState ? [ConfigurationScope.RESOURCE] : [ConfigurationScope.WINDOW, ConfigurationScope.RESOURCE]);
 		this.workspaceFilePathToConfiguration = Object.create(null);
 		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this.loadConfiguration().then(configuration => this.reloadConfigurationEventEmitter.fire(configuration), errors.onUnexpectedError), FolderConfiguration.RELOAD_CONFIGURATION_DELAY));
 	}
diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
index 065e6601dd6..2e4521f6e26 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -39,6 +39,11 @@ export enum ConfigurationEditingErrorCode {
 	 */
 	ERROR_UNKNOWN_KEY,
 
+	/**
+	 * Error when trying to write an application setting into workspace settings.
+	 */
+	ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION,
+
 	/**
 	 * Error when trying to write an invalid folder configuration key to folder settings.
 	 */
@@ -274,6 +279,7 @@ export class ConfigurationEditingService {
 
 			// API constraints
 			case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY: return nls.localize('errorUnknownKey', "Unable to write to {0} because {1} is not a registered configuration.", this.stringifyTarget(target), operation.key);
+			case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION: return nls.localize('errorInvalidWorkspaceConfigurationApplication', "Unable to write {0} to Workspace Settings. This setting can be written only into User settings.", operation.key);
 			case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_CONFIGURATION: return nls.localize('errorInvalidFolderConfiguration', "Unable to write to Folder Settings because {0} does not support the folder resource scope.", operation.key);
 			case ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET: return nls.localize('errorInvalidUserTarget', "Unable to write to User Settings because {0} does not support for global scope.", operation.key);
 			case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET: return nls.localize('errorInvalidWorkspaceTarget', "Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.", operation.key);
@@ -396,6 +402,15 @@ export class ConfigurationEditingService {
 			return this.wrapError(ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED, target, operation);
 		}
 
+		if (target === ConfigurationTarget.WORKSPACE) {
+			if (!operation.workspaceStandAloneConfigurationKey) {
+				const configurationProperties = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
+				if (configurationProperties[operation.key].scope === ConfigurationScope.APPLICATION) {
+					return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION, target, operation);
+				}
+			}
+		}
+
 		if (target === ConfigurationTarget.WORKSPACE_FOLDER) {
 			if (!operation.resource) {
 				return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_TARGET, target, operation);
diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts
index 72329335ed4..3284a2771a8 100644
--- a/src/vs/workbench/services/configuration/node/configurationService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationService.ts
@@ -10,7 +10,7 @@ import { dirname, basename } from 'path';
 import * as assert from 'vs/base/common/assert';
 import { Event, Emitter } from 'vs/base/common/event';
 import { StrictResourceMap } from 'vs/base/common/map';
-import { equals } from 'vs/base/common/objects';
+import { equals, deepClone } from 'vs/base/common/objects';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Queue } from 'vs/base/common/async';
 import { stat, writeFile } from 'vs/base/node/pfs';
@@ -24,7 +24,7 @@ import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides
 import { Configuration, WorkspaceConfigurationChangeEvent, AllKeysConfigurationChangeEvent } from 'vs/workbench/services/configuration/common/configurationModels';
 import { IWorkspaceConfigurationService, FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationNode, IConfigurationRegistry, Extensions, settingsSchema, resourceSettingsSchema, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationNode, IConfigurationRegistry, Extensions, IConfigurationPropertySchema, allSettings, windowSettings, resourceSettings, applicationSettings } from 'vs/platform/configuration/common/configurationRegistry';
 import { createHash } from 'crypto';
 import { getWorkspaceLabel, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
@@ -40,6 +40,8 @@ import { massageFolderPathForWorkspace } from 'vs/platform/workspaces/node/works
 import { distinct } from 'vs/base/common/arrays';
 import { UserConfiguration } from 'vs/platform/configuration/node/configuration';
 import { getBaseLabel } from 'vs/base/common/labels';
+import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
+import { localize } from 'vs/nls';
 
 export class WorkspaceService extends Disposable implements IWorkspaceConfigurationService, IWorkspaceContextService {
 
@@ -489,15 +491,29 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 	private registerConfigurationSchemas(): void {
 		if (this.workspace) {
 			const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
-			jsonRegistry.registerSchema(defaultSettingsSchemaId, settingsSchema);
-			jsonRegistry.registerSchema(userSettingsSchemaId, settingsSchema);
+			const convertToNotSuggestedProperties = (properties: IJSONSchemaMap, errorMessage: string): IJSONSchemaMap => {
+				return Object.keys(properties).reduce((result: IJSONSchemaMap, property) => {
+					result[property] = deepClone(properties[property]);
+					result[property].deprecationMessage = errorMessage;
+					return result;
+				}, {});
+			};
+
+			const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+			const unsupportedApplicationSettings = convertToNotSuggestedProperties(applicationSettings.properties, localize('unsupportedApplicationSetting', "This setting can be applied only in User Settings"));
+			const workspaceSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+
+			jsonRegistry.registerSchema(defaultSettingsSchemaId, allSettingsSchema);
+			jsonRegistry.registerSchema(userSettingsSchemaId, allSettingsSchema);
 
 			if (WorkbenchState.WORKSPACE === this.getWorkbenchState()) {
-				jsonRegistry.registerSchema(workspaceSettingsSchemaId, settingsSchema);
-				jsonRegistry.registerSchema(folderSettingsSchemaId, resourceSettingsSchema);
+				const unsupportedWindowSettings = convertToNotSuggestedProperties(windowSettings.properties, localize('unsupportedWindowSetting', "This setting cannot be applied now. It will be applied when you open this folder directly."));
+				const folderSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...unsupportedWindowSettings, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+				jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
+				jsonRegistry.registerSchema(folderSettingsSchemaId, folderSettingsSchema);
 			} else {
-				jsonRegistry.registerSchema(workspaceSettingsSchemaId, settingsSchema);
-				jsonRegistry.registerSchema(folderSettingsSchemaId, settingsSchema);
+				jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
+				jsonRegistry.registerSchema(folderSettingsSchemaId, workspaceSettingsSchema);
 			}
 		}
 	}
diff --git a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
index 2b675b8cab6..78af2a757c8 100644
--- a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
@@ -42,7 +42,7 @@ suite('FolderSettingsModelParser', () => {
 	});
 
 	test('parse all folder settings', () => {
-		const testObject = new FolderSettingsModelParser('settings');
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE, ConfigurationScope.WINDOW]);
 
 		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.executable': 'executable' }));
 
@@ -50,7 +50,7 @@ suite('FolderSettingsModelParser', () => {
 	});
 
 	test('parse resource folder settings', () => {
-		const testObject = new FolderSettingsModelParser('settings', ConfigurationScope.RESOURCE);
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE]);
 
 		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.executable': 'executable' }));
 
@@ -58,7 +58,7 @@ suite('FolderSettingsModelParser', () => {
 	});
 
 	test('reprocess folder settings excludes executable', () => {
-		const testObject = new FolderSettingsModelParser('settings');
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE, ConfigurationScope.WINDOW]);
 
 		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.anotherExecutable': 'executable' }));
 
diff --git a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
index b099e02c1b3..651ce72f7c6 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
@@ -632,6 +632,11 @@ suite('WorkspaceConfigurationService - Folder', () => {
 			'id': '_test',
 			'type': 'object',
 			'properties': {
+				'configurationService.folder.applicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				},
 				'configurationService.folder.testSetting': {
 					'type': 'string',
 					'default': 'isSet',
@@ -682,7 +687,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 	});
 
 	test('defaults', () => {
-		assert.deepEqual(testObject.getValue('configurationService'), { 'folder': { 'testSetting': 'isSet', 'executableSetting': 'isSet' } });
+		assert.deepEqual(testObject.getValue('configurationService'), { 'folder': { 'applicationSetting': 'isSet', 'testSetting': 'isSet', 'executableSetting': 'isSet' } });
 	});
 
 	test('globals override defaults', () => {
@@ -731,6 +736,13 @@ suite('WorkspaceConfigurationService - Folder', () => {
 			});
 	});
 
+	test('application settings are not read from workspace', () => {
+		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting": "userValue" }');
+		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.applicationSetting": "workspaceValue" }');
+		return testObject.reloadConfiguration()
+			.then(() => assert.equal(testObject.getValue('configurationService.folder.applicationSetting'), 'userValue'));
+	});
+
 	test('executable settings are not read from workspace', () => {
 		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.executableSetting": "userValue" }');
 		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.executableSetting": "workspaceValue" }');
@@ -880,6 +892,11 @@ suite('WorkspaceConfigurationService - Folder', () => {
 			.then(() => assert.equal(testObject.getValue('tasks.service.testSetting'), 'value'));
 	});
 
+	test('update application setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.folder.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
+	});
+
 	test('update tasks configuration', () => {
 		return testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, ConfigurationTarget.WORKSPACE)
 			.then(() => assert.deepEqual(testObject.getValue('tasks'), { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }));
@@ -922,6 +939,11 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 					'type': 'string',
 					'default': 'isSet'
 				},
+				'configurationService.workspace.applicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				},
 				'configurationService.workspace.testResourceSetting': {
 					'type': 'string',
 					'default': 'isSet',
@@ -1001,6 +1023,13 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 			.then(() => assert.deepEqual(testObject.getUnsupportedWorkspaceKeys(), ['configurationService.workspace.testExecutableSetting', 'configurationService.workspace.testExecutableResourceSetting']));
 	});
 
+	test('application settings are not read from workspace', () => {
+		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.applicationSetting": "userValue" }');
+		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'settings', value: { 'configurationService.workspace.applicationSetting': 'workspaceValue' } }, true)
+			.then(() => testObject.reloadConfiguration())
+			.then(() => assert.equal(testObject.getValue('configurationService.workspace.applicationSetting'), 'userValue'));
+	});
+
 	test('workspace settings override user settings after defaults are registered ', () => {
 		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.newSetting": "userValue" }');
 		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'settings', value: { 'configurationService.workspace.newSetting': 'workspaceValue' } }, true)
@@ -1020,6 +1049,13 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 			});
 	});
 
+	test('application settings are not read from workspace folder', () => {
+		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.applicationSetting": "userValue" }');
+		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.applicationSetting": "workspaceFolderValue" }');
+		return testObject.reloadConfiguration()
+			.then(() => assert.equal(testObject.getValue('configurationService.workspace.applicationSetting'), 'userValue'));
+	});
+
 	test('executable settings are not read from workspace folder after defaults are registered', () => {
 		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.testNewExecutableResourceSetting": "userValue" }');
 		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewExecutableResourceSetting": "workspaceFolderValue" }');
@@ -1206,6 +1242,11 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 			.then(() => assert.ok(target.called));
 	});
 
+	test('update application setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.workspace.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
+	});
+
 	test('update workspace folder configuration', () => {
 		const workspace = workspaceContextService.getWorkspace();
 		return testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)

From cfc3e0ffa6f9401a870b06f77ba8a7e447ad48af Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 4 Apr 2018 17:55:27 +0200
Subject: [PATCH 325/383] #46750 - Set update channel setting as application
 setting

---
 src/vs/platform/update/node/update.config.contribution.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/update/node/update.config.contribution.ts b/src/vs/platform/update/node/update.config.contribution.ts
index 9b368fa02b1..2ec106013a0 100644
--- a/src/vs/platform/update/node/update.config.contribution.ts
+++ b/src/vs/platform/update/node/update.config.contribution.ts
@@ -7,7 +7,7 @@
 
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 configurationRegistry.registerConfiguration({
@@ -20,6 +20,7 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'enum': ['none', 'default'],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('updateChannel', "Configure whether you receive automatic updates from an update channel. Requires a restart after change.")
 		},
 		'update.enableWindowsBackgroundUpdates': {

From a14cd440e11440431fa438567d7da6fe4e320724 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 4 Apr 2018 18:21:53 +0200
Subject: [PATCH 326/383] #46750 Expose application scope to extensions

---
 .../common/configurationExtensionPoint.ts            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
index 8ca3d17b3da..2bee4041a3c 100644
--- a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
@@ -36,9 +36,10 @@ const configurationEntrySchema: IJSONSchema = {
 							},
 							scope: {
 								type: 'string',
-								enum: ['window', 'resource'],
+								enum: ['application', 'window', 'resource'],
 								default: 'window',
 								enumDescriptions: [
+									nls.localize('scope.application.description', "Application specific configuration, which can be configured only in User settings."),
 									nls.localize('scope.window.description', "Window specific configuration, which can be configured in the User or Workspace settings."),
 									nls.localize('scope.resource.description', "Resource specific configuration, which can be configured in the User, Workspace or Folder settings.")
 								],
@@ -130,7 +131,14 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
 		for (let key in properties) {
 			const message = validateProperty(key);
 			const propertyConfiguration = configuration.properties[key];
-			propertyConfiguration.scope = propertyConfiguration.scope && propertyConfiguration.scope.toString() === 'resource' ? ConfigurationScope.RESOURCE : ConfigurationScope.WINDOW;
+			propertyConfiguration.scope = ConfigurationScope.WINDOW;
+			if (propertyConfiguration.scope) {
+				if (propertyConfiguration.scope.toString() === 'application') {
+					propertyConfiguration.scope = ConfigurationScope.APPLICATION;
+				} else if (propertyConfiguration.scope.toString() === 'resource') {
+					propertyConfiguration.scope = ConfigurationScope.RESOURCE;
+				}
+			}
 			propertyConfiguration.notMultiRootAdopted = !(extension.description.isBuiltin || (Array.isArray(extension.description.keywords) && extension.description.keywords.indexOf('multi-root ready') !== -1));
 			if (message) {
 				extension.collector.warn(message);

From 707d5ecd0d20ece194163fbed09a68a4c49bf648 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 4 Apr 2018 11:13:59 -0700
Subject: [PATCH 327/383] Fix basic PHP extension name

---
 extensions/php/package.nls.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/php/package.nls.json b/extensions/php/package.nls.json
index b6170bf3b9a..95897a72dec 100644
--- a/extensions/php/package.nls.json
+++ b/extensions/php/package.nls.json
@@ -1,4 +1,4 @@
 {
-	"displayName": "PHP Language Features",
+	"displayName": "PHP Language Basics",
 	"description": "Provides syntax highlighting and bracket matching for PHP files."
 }
\ No newline at end of file

From 7276c215a7562fbab39a73c48362546e970e42f0 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 4 Apr 2018 11:45:59 -0700
Subject: [PATCH 328/383] Zoom in issue reporter, fixes #46801

---
 .../issue/issueReporterMain.ts                | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index fe645528c44..d90240884e5 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -375,33 +375,32 @@ export class IssueReporter extends Disposable {
 		});
 
 		this.addEventListener('disableExtensions', 'keydown', (e: KeyboardEvent) => {
+			e.stopPropagation();
 			if (e.keyCode === 13 || e.keyCode === 32) {
 				ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
 				ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
 			}
 		});
 
-		// Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window
-		if (platform.isMacintosh) {
-			let prevKeyWasCommand = false;
-			document.onkeydown = (e: KeyboardEvent) => {
-				if (prevKeyWasCommand && e.keyCode === 13) {
-					if (this.createIssue()) {
-						remote.getCurrentWindow().close();
-					}
+		document.onkeydown = (e: KeyboardEvent) => {
+			const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+			// Cmd/Ctrl+Enter previews issue and closes window
+			if (cmdOrCtrlKey && e.keyCode === 13) {
+				if (this.createIssue()) {
+					remote.getCurrentWindow().close();
 				}
+			}
 
-				prevKeyWasCommand = e.keyCode === 91 || e.keyCode === 93;
-			};
-		} else {
-			document.onkeydown = (e: KeyboardEvent) => {
-				if (e.ctrlKey && e.keyCode === 13) {
-					if (this.createIssue()) {
-						remote.getCurrentWindow().close();
-					}
-				}
-			};
-		}
+			// Cmd/Ctrl + zooms in
+			if (cmdOrCtrlKey && e.keyCode === 187) {
+				this.applyZoom(webFrame.getZoomLevel() + 1);
+			}
+
+			// Cmd/Ctrl - zooms out
+			if (cmdOrCtrlKey && e.keyCode === 189) {
+				this.applyZoom(webFrame.getZoomLevel() - 1);
+			}
+		};
 	}
 
 	private updatePreviewButtonState() {

From eb7e893b7fa79ce05abbc900ddd8f76536c8fd28 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 4 Apr 2018 14:26:29 -0700
Subject: [PATCH 329/383] Remove "Preview" from search.location setting
 description

---
 .../parts/search/electron-browser/search.contribution.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index 9de9d564d94..013b18dd348 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -579,7 +579,7 @@ configurationRegistry.registerConfiguration({
 		'search.location': {
 			enum: ['sidebar', 'panel'],
 			default: 'sidebar',
-			description: nls.localize('search.location', "Preview: controls if the search will be shown as a view in the sidebar or as a panel in the panel area for more horizontal space. Next release search in panel will have improved horizontal layout and this will no longer be a preview."),
+			description: nls.localize('search.location', "Controls if the search will be shown as a view in the sidebar or as a panel in the panel area for more horizontal space. Next release search in panel will have improved horizontal layout and this will no longer be a preview."),
 		},
 	}
 });

From 96750628f7919941d6c1ec23b01b59ebca85025c Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 4 Apr 2018 16:48:15 -0700
Subject: [PATCH 330/383] Bump node-debug2

---
 build/builtInExtensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 696a6d05383..ca2bcf5144a 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -6,7 +6,7 @@
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.22.8",
+		"version": "1.23.0",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
 ]

From ba9921dfd0210e657c7cc998e6fb829dbbc5f17d Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 4 Apr 2018 18:03:19 -0700
Subject: [PATCH 331/383] Fix #45148 - Find in Files should hide replace input

---
 .../parts/search/browser/searchActions.ts         | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 6c6b5d03b53..0895c195cee 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -221,21 +221,16 @@ export abstract class FindOrReplaceInFilesAction extends Action {
 	}
 
 	public run(): TPromise<any> {
-		const searchView = getSearchView(this.viewletService, this.panelService);
 		return openSearchView(this.viewletService, this.panelService, true).then(openedView => {
-			if (!searchView || this.expandSearchReplaceWidget) {
-				const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
-				searchAndReplaceWidget.toggleReplace(this.expandSearchReplaceWidget);
-				// Focus replace only when there is text in the searchInput box
-				const focusReplace = this.focusReplace && searchAndReplaceWidget.searchInput.getValue();
-				searchAndReplaceWidget.focus(this.selectWidgetText, !!focusReplace);
-			}
+			const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
+			searchAndReplaceWidget.toggleReplace(this.expandSearchReplaceWidget);
+			// Focus replace only when there is text in the searchInput box
+			const focusReplace = this.focusReplace && searchAndReplaceWidget.searchInput.getValue();
+			searchAndReplaceWidget.focus(this.selectWidgetText, !!focusReplace);
 		});
 	}
 }
 
-export const SHOW_SEARCH_LABEL = nls.localize('showSearchViewlet', "Show Search");
-
 export class FindInFilesAction extends FindOrReplaceInFilesAction {
 
 	public static readonly LABEL = nls.localize('findInFiles', "Find in Files");

From fc389d227eb8defc10c4893d82d2751120489231 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 4 Apr 2018 18:12:19 -0700
Subject: [PATCH 332/383] Fix #46990 - "Toggle Search View Position" to command
 palette

---
 .../electron-browser/search.contribution.ts      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index 013b18dd348..5b65ba18480 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -16,7 +16,7 @@ import { Action } from 'vs/base/common/actions';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/parts/files/common/files';
-import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId, ICommandAction } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenExtensions } from 'vs/workbench/browser/quickopen';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -64,6 +64,8 @@ registerSingleton(ISearchWorkbenchService, SearchWorkbenchService);
 replaceContributions();
 searchWidgetContributions();
 
+const category = nls.localize('search', "Search");
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'workbench.action.search.toggleQueryDetails',
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -301,11 +303,14 @@ CommandsRegistry.registerCommand({
 });
 
 const toggleSearchViewPositionLabel = nls.localize('toggleSearchViewPositionLabel', "Toggle Search View Position");
+const ToggleSearchViewPositionCommand: ICommandAction = {
+	id: Constants.ToggleSearchViewPositionCommandId,
+	title: toggleSearchViewPositionLabel,
+	category
+};
+MenuRegistry.addCommand(ToggleSearchViewPositionCommand);
 MenuRegistry.appendMenuItem(MenuId.SearchContext, {
-	command: {
-		id: Constants.ToggleSearchViewPositionCommandId,
-		title: toggleSearchViewPositionLabel
-	},
+	command: ToggleSearchViewPositionCommand,
 	when: Constants.SearchViewVisibleKey,
 	group: 'search_9',
 	order: 1
@@ -431,7 +436,6 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
 
 // Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-const category = nls.localize('search', "Search");
 
 registry.registerWorkbenchAction(new SyncActionDescriptor(FindInFilesAction, VIEW_ID, nls.localize('showSearchViewl', "Show Search"), { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F },
 	Constants.SearchViewVisibleKey.toNegated()), 'View: Show Search', nls.localize('view', "View"));

From dd460f29af313afa3d4f4c02a07ecbf780f5664b Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 5 Apr 2018 10:18:45 +0200
Subject: [PATCH 333/383] Fixes #47004: Toggle comments shouldn't move cursor

---
 .../contrib/comment/lineCommentCommand.ts     |  8 ++--
 .../comment/test/lineCommentCommand.test.ts   | 47 ++++++++++++-------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/vs/editor/contrib/comment/lineCommentCommand.ts b/src/vs/editor/contrib/comment/lineCommentCommand.ts
index 4a31a0424b7..fd3c9a3912a 100644
--- a/src/vs/editor/contrib/comment/lineCommentCommand.ts
+++ b/src/vs/editor/contrib/comment/lineCommentCommand.ts
@@ -336,10 +336,10 @@ export class LineCommentCommand implements editorCommon.ICommand {
 		}
 
 		return new Selection(
-			result.startLineNumber,
-			result.startColumn + this._deltaColumn,
-			result.endLineNumber,
-			result.endColumn + this._deltaColumn
+			result.selectionStartLineNumber,
+			result.selectionStartColumn + this._deltaColumn,
+			result.positionLineNumber,
+			result.positionColumn + this._deltaColumn
 		);
 	}
 
diff --git a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
index 57cd4ccde56..932e73bde2e 100644
--- a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
@@ -256,7 +256,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t!@# some text',
 				'\t!@# some more text'
 			],
-			new Selection(1, 1, 2, 2)
+			new Selection(2, 2, 1, 1)
 		);
 	});
 
@@ -271,7 +271,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t!@# some text',
 				'    !@# some more text'
 			],
-			new Selection(1, 1, 2, 2)
+			new Selection(2, 2, 1, 1)
 		);
 	});
 
@@ -290,7 +290,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'',
 				'\t!@# some more text'
 			],
-			new Selection(1, 1, 4, 2)
+			new Selection(4, 2, 1, 1)
 		);
 	});
 
@@ -307,7 +307,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t   ',
 				'\t\tsome more text'
 			],
-			new Selection(1, 1, 3, 2)
+			new Selection(3, 2, 1, 1)
 		);
 	});
 
@@ -324,7 +324,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t!@# ',
 				'\t\tsome more text'
 			],
-			new Selection(1, 1, 3, 1)
+			new Selection(3, 1, 1, 1)
 		);
 	});
 
@@ -369,7 +369,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'first!@#',
 				'\t!@# second line'
 			],
-			new Selection(2, 1, 2, 7)
+			new Selection(2, 7, 2, 1)
 		);
 	});
 
@@ -390,7 +390,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 2, 1)
+			new Selection(2, 1, 1, 5)
 		);
 	});
 
@@ -411,7 +411,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 2, 8)
+			new Selection(2, 8, 1, 5)
 		);
 	});
 
@@ -432,7 +432,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'!@# fourth line',
 				'fifth'
 			],
-			new Selection(3, 5, 4, 8)
+			new Selection(4, 8, 3, 5)
 		);
 	});
 
@@ -493,7 +493,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 2, 8)
+			new Selection(2, 8, 1, 5)
 		);
 
 		testLineCommentCommand(
@@ -512,7 +512,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 1, 2, 3)
+			new Selection(2, 3, 1, 1)
 		);
 	});
 
@@ -607,6 +607,21 @@ suite('Editor Contrib - Line Comment Command', () => {
 			new Selection(1, 1, 8, 60)
 		);
 	});
+
+	test('issue #47004: Toggle comments shouldn\'t move cursor', () => {
+		testAddLineCommentCommand(
+			[
+				'    A line',
+				'    Another line'
+			],
+			new Selection(2, 7, 1, 1),
+			[
+				'    !@# A line',
+				'    !@# Another line'
+			],
+			new Selection(2, 11, 1, 1)
+		);
+	});
 });
 
 suite('Editor Contrib - Line Comment As Block Comment', () => {
@@ -655,7 +670,7 @@ suite('Editor Contrib - Line Comment As Block Comment', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 1, 1, 6)
+			new Selection(1, 6, 1, 1)
 		);
 	});
 
@@ -697,7 +712,7 @@ suite('Editor Contrib - Line Comment As Block Comment', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 3, 2)
+			new Selection(3, 2, 1, 5)
 		);
 
 		testLineCommentCommand(
@@ -716,7 +731,7 @@ suite('Editor Contrib - Line Comment As Block Comment', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 1, 3, 11)
+			new Selection(3, 11, 1, 1)
 		);
 	});
 });
@@ -842,7 +857,7 @@ suite('Editor Contrib - Line Comment As Block Comment 2', () => {
 				'fourth line',
 				'\t\tfifth\t\t'
 			],
-			new Selection(5, 3, 5, 8)
+			new Selection(5, 8, 5, 3)
 		);
 
 		testLineCommentCommand(
@@ -861,7 +876,7 @@ suite('Editor Contrib - Line Comment As Block Comment 2', () => {
 				'fourth line',
 				'\t\tfifth\t\t'
 			],
-			new Selection(5, 3, 5, 8)
+			new Selection(5, 8, 5, 3)
 		);
 
 		testLineCommentCommand(

From b07b786e18f997a74e4eb84ce76df5c3cd6eb57e Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 5 Apr 2018 11:36:59 +0200
Subject: [PATCH 334/383] Better usage of editor API

---
 .../editor/browser/widget/diffEditorWidget.ts |  7 +--
 .../contrib/colorPicker/colorDetector.ts      |  3 +-
 src/vs/editor/contrib/dnd/dnd.ts              | 17 ++----
 .../contrib/folding/foldingDecorations.ts     | 12 ++--
 .../contrib/inPlaceReplace/inPlaceReplace.ts  |  5 +-
 src/vs/editor/contrib/links/links.ts          | 42 +++++++-------
 .../editor/contrib/multicursor/multicursor.ts |  4 +-
 .../referenceSearch/referencesWidget.ts       | 55 +++++++++----------
 .../editor/contrib/snippet/snippetSession.ts  |  4 +-
 .../browser/quickOpen/editorQuickOpen.ts      | 36 ++++++------
 .../debug/electron-browser/debugHover.ts      |  9 ++-
 .../browser/preferencesRenderers.ts           | 10 ++--
 12 files changed, 93 insertions(+), 111 deletions(-)

diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index b823747dede..fd92e00b778 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -99,12 +99,7 @@ class VisualEditorState {
 		this._zonesMap = {};
 
 		// (2) Model decorations
-		if (this._decorations.length > 0) {
-			editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-				changeAccessor.deltaDecorations(this._decorations, []);
-			});
-		}
-		this._decorations = [];
+		this._decorations = editor.deltaDecorations(this._decorations, []);
 	}
 
 	public apply(editor: CodeEditor, overviewRuler: editorBrowser.IOverviewRuler, newDecorations: IEditorDiffDecorationsWithZones): void {
diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts
index b839e90d207..97fbb7b8852 100644
--- a/src/vs/editor/contrib/colorPicker/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts
@@ -16,6 +16,7 @@ import { ColorProviderRegistry } from 'vs/editor/common/modes';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/color';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 
 const MAX_DECORATORS = 500;
 
@@ -153,7 +154,7 @@ export class ColorDetector implements IEditorContribution {
 				endLineNumber: c.colorInfo.range.endLineNumber,
 				endColumn: c.colorInfo.range.endColumn
 			},
-			options: {}
+			options: ModelDecorationOptions.EMPTY
 		}));
 
 		this._decorationsIds = this._editor.deltaDecorations(this._decorationsIds, decorations);
diff --git a/src/vs/editor/contrib/dnd/dnd.ts b/src/vs/editor/contrib/dnd/dnd.ts
index 6cc7e1aced4..25a6ccf4363 100644
--- a/src/vs/editor/contrib/dnd/dnd.ts
+++ b/src/vs/editor/contrib/dnd/dnd.ts
@@ -173,22 +173,17 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
 	});
 
 	public showAt(position: Position): void {
-		this._editor.changeDecorations(changeAccessor => {
-			let newDecorations: IModelDeltaDecoration[] = [];
-			newDecorations.push({
-				range: new Range(position.lineNumber, position.column, position.lineNumber, position.column),
-				options: DragAndDropController._DECORATION_OPTIONS
-			});
+		let newDecorations: IModelDeltaDecoration[] = [{
+			range: new Range(position.lineNumber, position.column, position.lineNumber, position.column),
+			options: DragAndDropController._DECORATION_OPTIONS
+		}];
 
-			this._dndDecorationIds = changeAccessor.deltaDecorations(this._dndDecorationIds, newDecorations);
-		});
+		this._dndDecorationIds = this._editor.deltaDecorations(this._dndDecorationIds, newDecorations);
 		this._editor.revealPosition(position, editorCommon.ScrollType.Immediate);
 	}
 
 	private _removeDecoration(): void {
-		this._editor.changeDecorations(changeAccessor => {
-			changeAccessor.deltaDecorations(this._dndDecorationIds, []);
-		});
+		this._dndDecorationIds = this._editor.deltaDecorations(this._dndDecorationIds, []);
 	}
 
 	private _hitContent(target: IMouseTarget): boolean {
diff --git a/src/vs/editor/contrib/folding/foldingDecorations.ts b/src/vs/editor/contrib/folding/foldingDecorations.ts
index fcc392cb184..17359b411fb 100644
--- a/src/vs/editor/contrib/folding/foldingDecorations.ts
+++ b/src/vs/editor/contrib/folding/foldingDecorations.ts
@@ -10,18 +10,18 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 export class FoldingDecorationProvider implements IDecorationProvider {
 
-	private COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
+	private static COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		afterContentClassName: 'inline-folded',
 		linesDecorationsClassName: 'folding collapsed'
 	});
 
-	private EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({
+	private static EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		linesDecorationsClassName: 'folding'
 	});
 
-	private EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({
+	private static EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		linesDecorationsClassName: 'folding alwaysShowFoldIcons'
 	});
@@ -33,11 +33,11 @@ export class FoldingDecorationProvider implements IDecorationProvider {
 
 	getDecorationOption(isCollapsed: boolean): ModelDecorationOptions {
 		if (isCollapsed) {
-			return this.COLLAPSED_VISUAL_DECORATION;
+			return FoldingDecorationProvider.COLLAPSED_VISUAL_DECORATION;
 		} else if (this.autoHideFoldingControls) {
-			return this.EXPANDED_AUTO_HIDE_VISUAL_DECORATION;
+			return FoldingDecorationProvider.EXPANDED_AUTO_HIDE_VISUAL_DECORATION;
 		} else {
-			return this.EXPANDED_VISUAL_DECORATION;
+			return FoldingDecorationProvider.EXPANDED_VISUAL_DECORATION;
 		}
 	}
 
diff --git a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
index 0d8c406b5e7..18548f6eccc 100644
--- a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
+++ b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
@@ -10,7 +10,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { registerEditorAction, ServicesAccessor, EditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { IInplaceReplaceSupportResult } from 'vs/editor/common/modes';
@@ -131,9 +130,7 @@ class InPlaceReplaceController implements IEditorContribution {
 			this.decorationRemover.cancel();
 			this.decorationRemover = TPromise.timeout(350);
 			this.decorationRemover.then(() => {
-				this.editor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
-					this.decorationIds = accessor.deltaDecorations(this.decorationIds, []);
-				});
+				this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 			});
 		});
 	}
diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index d62f77d70a4..b9814039159 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -251,32 +251,30 @@ class LinkDetector implements editorCommon.IEditorContribution {
 
 	private updateDecorations(links: Link[]): void {
 		const useMetaKey = (this.editor.getConfiguration().multiCursorModifier === 'altKey');
-		this.editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-			var oldDecorations: string[] = [];
-			let keys = Object.keys(this.currentOccurrences);
-			for (let i = 0, len = keys.length; i < len; i++) {
-				let decorationId = keys[i];
-				let occurance = this.currentOccurrences[decorationId];
-				oldDecorations.push(occurance.decorationId);
-			}
+		let oldDecorations: string[] = [];
+		let keys = Object.keys(this.currentOccurrences);
+		for (let i = 0, len = keys.length; i < len; i++) {
+			let decorationId = keys[i];
+			let occurance = this.currentOccurrences[decorationId];
+			oldDecorations.push(occurance.decorationId);
+		}
 
-			var newDecorations: IModelDeltaDecoration[] = [];
-			if (links) {
-				// Not sure why this is sometimes null
-				for (var i = 0; i < links.length; i++) {
-					newDecorations.push(LinkOccurrence.decoration(links[i], useMetaKey));
-				}
+		let newDecorations: IModelDeltaDecoration[] = [];
+		if (links) {
+			// Not sure why this is sometimes null
+			for (let i = 0; i < links.length; i++) {
+				newDecorations.push(LinkOccurrence.decoration(links[i], useMetaKey));
 			}
+		}
 
-			var decorations = changeAccessor.deltaDecorations(oldDecorations, newDecorations);
+		let decorations = this.editor.deltaDecorations(oldDecorations, newDecorations);
 
-			this.currentOccurrences = {};
-			this.activeLinkDecorationId = null;
-			for (let i = 0, len = decorations.length; i < len; i++) {
-				var occurance = new LinkOccurrence(links[i], decorations[i]);
-				this.currentOccurrences[occurance.decorationId] = occurance;
-			}
-		});
+		this.currentOccurrences = {};
+		this.activeLinkDecorationId = null;
+		for (let i = 0, len = decorations.length; i < len; i++) {
+			let occurance = new LinkOccurrence(links[i], decorations[i]);
+			this.currentOccurrences[occurance.decorationId] = occurance;
+		}
 	}
 
 	private _onEditorMouseMove(mouseEvent: ClickLinkMouseEvent, withKey?: ClickLinkKeyboardEvent): void {
diff --git a/src/vs/editor/contrib/multicursor/multicursor.ts b/src/vs/editor/contrib/multicursor/multicursor.ts
index 6561c8b9ab6..931c4f02404 100644
--- a/src/vs/editor/contrib/multicursor/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/multicursor.ts
@@ -803,9 +803,7 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 		this.state = state;
 
 		if (!this.state) {
-			if (this.decorations.length > 0) {
-				this.decorations = this.editor.deltaDecorations(this.decorations, []);
-			}
+			this.decorations = this.editor.deltaDecorations(this.decorations, []);
 			return;
 		}
 
diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index 125595fb249..d944550b9d1 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -84,28 +84,25 @@ class DecorationsManager implements IDisposable {
 	private _addDecorations(reference: FileReferences): void {
 		this._callOnModelChange.push(this._editor.getModel().onDidChangeDecorations((event) => this._onDecorationChanged()));
 
-		this._editor.changeDecorations(accessor => {
+		const newDecorations: IModelDeltaDecoration[] = [];
+		const newDecorationsActualIndex: number[] = [];
 
-			const newDecorations: IModelDeltaDecoration[] = [];
-			const newDecorationsActualIndex: number[] = [];
-
-			for (let i = 0, len = reference.children.length; i < len; i++) {
-				let oneReference = reference.children[i];
-				if (this._decorationIgnoreSet.has(oneReference.id)) {
-					continue;
-				}
-				newDecorations.push({
-					range: oneReference.range,
-					options: DecorationsManager.DecorationOptions
-				});
-				newDecorationsActualIndex.push(i);
+		for (let i = 0, len = reference.children.length; i < len; i++) {
+			let oneReference = reference.children[i];
+			if (this._decorationIgnoreSet.has(oneReference.id)) {
+				continue;
 			}
+			newDecorations.push({
+				range: oneReference.range,
+				options: DecorationsManager.DecorationOptions
+			});
+			newDecorationsActualIndex.push(i);
+		}
 
-			const decorations = accessor.deltaDecorations([], newDecorations);
-			for (let i = 0; i < decorations.length; i++) {
-				this._decorations.set(decorations[i], reference.children[newDecorationsActualIndex[i]]);
-			}
-		});
+		const decorations = this._editor.deltaDecorations([], newDecorations);
+		for (let i = 0; i < decorations.length; i++) {
+			this._decorations.set(decorations[i], reference.children[newDecorationsActualIndex[i]]);
+		}
 	}
 
 	private _onDecorationChanged(): void {
@@ -143,21 +140,19 @@ class DecorationsManager implements IDisposable {
 			}
 		});
 
-		this._editor.changeDecorations((accessor) => {
-			for (let i = 0, len = toRemove.length; i < len; i++) {
-				this._decorations.delete(toRemove[i]);
-			}
-			accessor.deltaDecorations(toRemove, []);
-		});
+		for (let i = 0, len = toRemove.length; i < len; i++) {
+			this._decorations.delete(toRemove[i]);
+		}
+		this._editor.deltaDecorations(toRemove, []);
 	}
 
 	public removeDecorations(): void {
-		this._editor.changeDecorations(accessor => {
-			this._decorations.forEach((value, key) => {
-				accessor.removeDecoration(key);
-			});
-			this._decorations.clear();
+		let toRemove: string[] = [];
+		this._decorations.forEach((value, key) => {
+			toRemove.push(key);
 		});
+		this._editor.deltaDecorations(toRemove, []);
+		this._decorations.clear();
 	}
 }
 
diff --git a/src/vs/editor/contrib/snippet/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts
index 218e5ec9fd5..a101e5e16bb 100644
--- a/src/vs/editor/contrib/snippet/snippetSession.ts
+++ b/src/vs/editor/contrib/snippet/snippetSession.ts
@@ -50,7 +50,9 @@ export class OneSnippet {
 
 	dispose(): void {
 		if (this._placeholderDecorations) {
-			this._editor.changeDecorations(accessor => this._placeholderDecorations.forEach(handle => accessor.removeDecoration(handle)));
+			let toRemove: string[] = [];
+			this._placeholderDecorations.forEach(handle => toRemove.push(handle));
+			this._editor.deltaDecorations(toRemove, []);
 		}
 		this._placeholderGroups.length = 0;
 	}
diff --git a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
index 8d1bce53f7b..8bd223b6a2f 100644
--- a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
@@ -14,7 +14,7 @@ import { registerEditorContribution, IActionOptions, EditorAction } from 'vs/edi
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Range } from 'vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IModelDecorationsChangeAccessor, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { IModelDeltaDecoration } from 'vs/editor/common/model';
 
 export interface IQuickOpenControllerOpts {
 	inputAriaLabel: string;
@@ -100,31 +100,27 @@ export class QuickOpenController implements editorCommon.IEditorContribution, ID
 	});
 
 	public decorateLine(range: Range, editor: ICodeEditor): void {
-		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-			const oldDecorations: string[] = [];
-			if (this.rangeHighlightDecorationId) {
-				oldDecorations.push(this.rangeHighlightDecorationId);
-				this.rangeHighlightDecorationId = null;
+		const oldDecorations: string[] = [];
+		if (this.rangeHighlightDecorationId) {
+			oldDecorations.push(this.rangeHighlightDecorationId);
+			this.rangeHighlightDecorationId = null;
+		}
+
+		const newDecorations: IModelDeltaDecoration[] = [
+			{
+				range: range,
+				options: QuickOpenController._RANGE_HIGHLIGHT_DECORATION
 			}
+		];
 
-			const newDecorations: IModelDeltaDecoration[] = [
-				{
-					range: range,
-					options: QuickOpenController._RANGE_HIGHLIGHT_DECORATION
-				}
-			];
-
-			const decorations = changeAccessor.deltaDecorations(oldDecorations, newDecorations);
-			this.rangeHighlightDecorationId = decorations[0];
-		});
+		const decorations = editor.deltaDecorations(oldDecorations, newDecorations);
+		this.rangeHighlightDecorationId = decorations[0];
 	}
 
 	public clearDecorations(): void {
 		if (this.rangeHighlightDecorationId) {
-			this.editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-				changeAccessor.deltaDecorations([this.rangeHighlightDecorationId], []);
-				this.rangeHighlightDecorationId = null;
-			});
+			this.editor.deltaDecorations([this.rangeHighlightDecorationId], []);
+			this.rangeHighlightDecorationId = null;
 		}
 	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
index e6248b7f74e..c91609db06a 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
@@ -27,6 +27,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
 import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 
 const $ = dom.$;
 const MAX_ELEMENTS_SHOWN = 18;
@@ -208,15 +209,17 @@ export class DebugHoverWidget implements IContentWidget {
 
 			this.highlightDecorations = this.editor.deltaDecorations(this.highlightDecorations, [{
 				range: new Range(pos.lineNumber, expressionRange.startColumn, pos.lineNumber, expressionRange.startColumn + matchingExpression.length),
-				options: {
-					className: 'hoverHighlight'
-				}
+				options: DebugHoverWidget._HOVER_HIGHLIGHT_DECORATION_OPTIONS
 			}]);
 
 			return this.doShow(pos, expression, focus);
 		});
 	}
 
+	private static _HOVER_HIGHLIGHT_DECORATION_OPTIONS = ModelDecorationOptions.register({
+		className: 'hoverHighlight'
+	});
+
 	private doFindExpression(container: IExpressionContainer, namesToFind: string[]): TPromise<IExpression> {
 		if (!container) {
 			return TPromise.as(null);
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 6f134ab7bc9..f033c84ab3e 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -890,13 +890,15 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 	private createDecoration(range: IRange, model: ITextModel): IModelDeltaDecoration {
 		return {
 			range,
-			options: {
-				stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-				className: 'findMatch'
-			}
+			options: FilteredMatchesRenderer._FIND_MATCH
 		};
 	}
 
+	private static readonly _FIND_MATCH = ModelDecorationOptions.register({
+		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		className: 'findMatch'
+	});
+
 	private computeHiddenRanges(filteredGroups: ISettingsGroup[], allSettingsGroups: ISettingsGroup[], model: ITextModel): IRange[] {
 		// Hide the contents of hidden groups
 		const notMatchesRanges: IRange[] = [];

From 843facb14633ca588d5e44a83e728f674961a2fd Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 5 Apr 2018 11:54:27 +0200
Subject: [PATCH 335/383] Introduce and adopt IModelDecorationOptions.zIndex
 (#46995)

---
 .../browser/viewParts/decorations/decorations.ts     | 10 ++++++++--
 src/vs/editor/common/model.ts                        |  7 ++++++-
 src/vs/editor/common/model/intervalTree.ts           | 11 ++++-------
 src/vs/editor/common/model/textModel.ts              | 12 +++++-------
 src/vs/editor/common/services/modelServiceImpl.ts    |  8 +++++++-
 src/vs/monaco.d.ts                                   |  5 +++++
 6 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/decorations/decorations.ts b/src/vs/editor/browser/viewParts/decorations/decorations.ts
index da0359739fe..1c3f303611d 100644
--- a/src/vs/editor/browser/viewParts/decorations/decorations.ts
+++ b/src/vs/editor/browser/viewParts/decorations/decorations.ts
@@ -85,8 +85,14 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 
 		// Sort decorations for consistent render output
 		decorations = decorations.sort((a, b) => {
-			let aClassName = a.options.className;
-			let bClassName = b.options.className;
+			if (a.options.zIndex < b.options.zIndex) {
+				return -1;
+			}
+			if (a.options.zIndex > b.options.zIndex) {
+				return 1;
+			}
+			const aClassName = a.options.className;
+			const bClassName = b.options.className;
 
 			if (aClassName < bClassName) {
 				return -1;
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 2f2a7433d4b..03c99eb566a 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -81,7 +81,12 @@ export interface IModelDecorationOptions {
 	 * Always render the decoration (even when the range it encompasses is collapsed).
 	 * @internal
 	 */
-	readonly showIfCollapsed?: boolean;
+	showIfCollapsed?: boolean;
+	/**
+	 * Specifies the stack order of a decoration.
+	 * A decoration with greater stack order is always in front of a decoration with a lower stack order.
+	 */
+	zIndex?: number;
 	/**
 	 * If set, render this decoration in the overview ruler.
 	 */
diff --git a/src/vs/editor/common/model/intervalTree.ts b/src/vs/editor/common/model/intervalTree.ts
index 07f7200be6e..55636d2eace 100644
--- a/src/vs/editor/common/model/intervalTree.ts
+++ b/src/vs/editor/common/model/intervalTree.ts
@@ -12,14 +12,11 @@ import { IModelDecoration } from 'vs/editor/common/model';
 // The red-black tree is based on the "Introduction to Algorithms" by Cormen, Leiserson and Rivest.
 //
 
-/**
- * The class name sort order must match the severity order. Highest severity last.
- */
 export const ClassName = {
-	EditorHintDecoration: 'squiggly-a-hint',
-	EditorInfoDecoration: 'squiggly-b-info',
-	EditorWarningDecoration: 'squiggly-c-warning',
-	EditorErrorDecoration: 'squiggly-d-error'
+	EditorHintDecoration: 'squiggly-hint',
+	EditorInfoDecoration: 'squiggly-info',
+	EditorWarningDecoration: 'squiggly-warning',
+	EditorErrorDecoration: 'squiggly-error'
 };
 
 /**
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index e169ad2684c..2127ebf1a00 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -2585,22 +2585,20 @@ export class ModelDecorationOverviewRulerOptions implements model.IModelDecorati
 	}
 }
 
-let lastStaticId = 0;
-
 export class ModelDecorationOptions implements model.IModelDecorationOptions {
 
 	public static EMPTY: ModelDecorationOptions;
 
 	public static register(options: model.IModelDecorationOptions): ModelDecorationOptions {
-		return new ModelDecorationOptions(++lastStaticId, options);
+		return new ModelDecorationOptions(options);
 	}
 
 	public static createDynamic(options: model.IModelDecorationOptions): ModelDecorationOptions {
-		return new ModelDecorationOptions(0, options);
+		return new ModelDecorationOptions(options);
 	}
 
-	readonly staticId: number;
 	readonly stickiness: model.TrackedRangeStickiness;
+	readonly zIndex: number;
 	readonly className: string;
 	readonly hoverMessage: IMarkdownString | IMarkdownString[];
 	readonly glyphMarginHoverMessage: IMarkdownString | IMarkdownString[];
@@ -2614,9 +2612,9 @@ export class ModelDecorationOptions implements model.IModelDecorationOptions {
 	readonly beforeContentClassName: string;
 	readonly afterContentClassName: string;
 
-	private constructor(staticId: number, options: model.IModelDecorationOptions) {
-		this.staticId = staticId;
+	private constructor(options: model.IModelDecorationOptions) {
 		this.stickiness = options.stickiness || model.TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges;
+		this.zIndex = options.zIndex || 0;
 		this.className = options.className ? cleanClassName(options.className) : strings.empty;
 		this.hoverMessage = options.hoverMessage || [];
 		this.glyphMarginHoverMessage = options.glyphMarginHoverMessage || [];
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
index 041cf88e4d6..fa395f924f0 100644
--- a/src/vs/editor/common/services/modelServiceImpl.ts
+++ b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -118,26 +118,31 @@ class ModelMarkerHandler {
 		let className: string;
 		let color: ThemeColor;
 		let darkColor: ThemeColor;
+		let zIndex: number;
 
 		switch (marker.severity) {
 			case MarkerSeverity.Hint:
 				className = ClassName.EditorHintDecoration;
+				zIndex = 0;
 				break;
 			case MarkerSeverity.Warning:
 				className = ClassName.EditorWarningDecoration;
 				color = themeColorFromId(overviewRulerWarning);
 				darkColor = themeColorFromId(overviewRulerWarning);
+				zIndex = 20;
 				break;
 			case MarkerSeverity.Info:
 				className = ClassName.EditorInfoDecoration;
 				color = themeColorFromId(overviewRulerInfo);
 				darkColor = themeColorFromId(overviewRulerInfo);
+				zIndex = 10;
 				break;
 			case MarkerSeverity.Error:
 			default:
 				className = ClassName.EditorErrorDecoration;
 				color = themeColorFromId(overviewRulerError);
 				darkColor = themeColorFromId(overviewRulerError);
+				zIndex = 30;
 				break;
 		}
 
@@ -177,7 +182,8 @@ class ModelMarkerHandler {
 				color,
 				darkColor,
 				position: OverviewRulerLane.Right
-			}
+			},
+			zIndex
 		};
 	}
 }
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index e1e2ccb0a60..715a3ec520d 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -1193,6 +1193,11 @@ declare namespace monaco.editor {
 		 * Should the decoration expand to encompass a whole line.
 		 */
 		isWholeLine?: boolean;
+		/**
+		 * Specifies the stack order of a decoration.
+		 * A decoration with greater stack order is always in front of a decoration with a lower stack order.
+		 */
+		zIndex?: number;
 		/**
 		 * If set, render this decoration in the overview ruler.
 		 */

From f26b9ef408b843101cd865b72a96a156bc2b3e72 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 5 Apr 2018 11:57:44 +0200
Subject: [PATCH 336/383] Fixes #46995: Add a higher zIndex to currentFindMatch

---
 src/vs/editor/contrib/find/findDecorations.ts       | 1 +
 src/vs/workbench/parts/search/common/searchModel.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/vs/editor/contrib/find/findDecorations.ts b/src/vs/editor/contrib/find/findDecorations.ts
index 84ddb11b262..ff1c795d2e3 100644
--- a/src/vs/editor/contrib/find/findDecorations.ts
+++ b/src/vs/editor/contrib/find/findDecorations.ts
@@ -267,6 +267,7 @@ export class FindDecorations implements IDisposable {
 
 	private static readonly _CURRENT_FIND_MATCH_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		zIndex: 13,
 		className: 'currentFindMatch',
 		showIfCollapsed: true,
 		overviewRuler: {
diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts
index ac9827a3d67..6084c48c45d 100644
--- a/src/vs/workbench/parts/search/common/searchModel.ts
+++ b/src/vs/workbench/parts/search/common/searchModel.ts
@@ -95,6 +95,7 @@ export class FileMatch extends Disposable {
 
 	private static readonly _CURRENT_FIND_MATCH = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		zIndex: 13,
 		className: 'currentFindMatch',
 		overviewRuler: {
 			color: themeColorFromId(overviewRulerFindMatchForeground),

From e50d290378f0758c4af73b8d5236083312f8710e Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 5 Apr 2018 12:21:10 +0200
Subject: [PATCH 337/383] Fixes #10047: include `rangeOffset` in
 `TextDocumentContentChangeEvent`

---
 src/vs/editor/common/model.ts                            | 1 -
 src/vs/editor/common/model/textModel.ts                  | 9 +++++----
 src/vs/editor/common/model/textModelEvents.ts            | 4 ++++
 src/vs/monaco.d.ts                                       | 4 ++++
 src/vs/vscode.d.ts                                       | 4 ++++
 src/vs/workbench/api/node/extHostDocuments.ts            | 1 +
 .../electron-browser/api/extHostDocumentData.test.ts     | 6 ++++++
 .../api/extHostDocumentSaveParticipant.test.ts           | 2 ++
 8 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 03c99eb566a..ff909869d8e 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -1152,6 +1152,5 @@ export class ApplyEditsResult {
  */
 export interface IInternalModelContentChange extends IModelContentChange {
 	range: Range;
-	rangeOffset: number;
 	forceMoveMarkers: boolean;
 }
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 2127ebf1a00..3975b563698 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -386,10 +386,11 @@ export class TextModel extends Disposable implements model.ITextModel {
 		this.setValueFromTextBuffer(textBuffer);
 	}
 
-	private _createContentChanged2(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, rangeLength: number, text: string, isUndoing: boolean, isRedoing: boolean, isFlush: boolean): IModelContentChangedEvent {
+	private _createContentChanged2(range: Range, rangeOffset: number, rangeLength: number, text: string, isUndoing: boolean, isRedoing: boolean, isFlush: boolean): IModelContentChangedEvent {
 		return {
 			changes: [{
-				range: new Range(startLineNumber, startColumn, endLineNumber, endColumn),
+				range: range,
+				rangeOffset: rangeOffset,
 				rangeLength: rangeLength,
 				text: text,
 			}],
@@ -435,7 +436,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 				false,
 				false
 			),
-			this._createContentChanged2(1, 1, endLineNumber, endColumn, oldModelValueLength, this.getValue(), false, false, true)
+			this._createContentChanged2(new Range(1, 1, endLineNumber, endColumn), 0, oldModelValueLength, this.getValue(), false, false, true)
 		);
 	}
 
@@ -466,7 +467,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 				false,
 				false
 			),
-			this._createContentChanged2(1, 1, endLineNumber, endColumn, oldModelValueLength, this.getValue(), false, false, false)
+			this._createContentChanged2(new Range(1, 1, endLineNumber, endColumn), 0, oldModelValueLength, this.getValue(), false, false, false)
 		);
 	}
 
diff --git a/src/vs/editor/common/model/textModelEvents.ts b/src/vs/editor/common/model/textModelEvents.ts
index f65fdca1ef2..d6593abd1cb 100644
--- a/src/vs/editor/common/model/textModelEvents.ts
+++ b/src/vs/editor/common/model/textModelEvents.ts
@@ -32,6 +32,10 @@ export interface IModelContentChange {
 	 * The range that got replaced.
 	 */
 	readonly range: IRange;
+	/**
+	 * The offset of the range that got replaced.
+	 */
+	readonly rangeOffset: number;
 	/**
 	 * The length of the range that got replaced.
 	 */
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 715a3ec520d..6c481514777 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2196,6 +2196,10 @@ declare namespace monaco.editor {
 		 * The range that got replaced.
 		 */
 		readonly range: IRange;
+		/**
+		 * The offset of the range that got replaced.
+		 */
+		readonly rangeOffset: number;
 		/**
 		 * The length of the range that got replaced.
 		 */
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index c841a93202a..8142906c5ec 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -5511,6 +5511,10 @@ declare module 'vscode' {
 		 * The range that got replaced.
 		 */
 		range: Range;
+		/**
+		 * The offset of the range that got replaced.
+		 */
+		rangeOffset: number;
 		/**
 		 * The length of the range that got replaced.
 		 */
diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts
index 05cae8cfcb6..54e17e42f71 100644
--- a/src/vs/workbench/api/node/extHostDocuments.ts
+++ b/src/vs/workbench/api/node/extHostDocuments.ts
@@ -137,6 +137,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 			contentChanges: events.changes.map((change) => {
 				return {
 					range: TypeConverters.toRange(change.range),
+					rangeOffset: change.rangeOffset,
 					rangeLength: change.rangeLength,
 					text: change.text
 				};
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
index f808f44c17f..daad9c035e9 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
@@ -101,6 +101,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: '\t '
 			}],
@@ -157,6 +158,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 1, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: ''
 			}],
@@ -174,6 +176,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 1, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: 'is could be'
 			}],
@@ -191,6 +194,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 1, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: 'is could be\na line with number'
 			}],
@@ -211,6 +215,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 2, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: ''
 			}],
@@ -344,6 +349,7 @@ suite('ExtHostDocumentData updates line mapping', () => {
 		return {
 			changes: [{
 				range: range,
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: text
 			}],
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
index b44d25fba63..a8c6bfbfcdf 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
@@ -302,6 +302,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 			documents.$acceptModelChanged(resource, {
 				changes: [{
 					range: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
+					rangeOffset: undefined,
 					rangeLength: undefined,
 					text: 'bar'
 				}],
@@ -337,6 +338,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 							changes: [{
 								range,
 								text,
+								rangeOffset: undefined,
 								rangeLength: undefined,
 							}],
 							eol: undefined,

From 51512bc594bcc6e6d0e67a86f2e617e78ef1913f Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 5 Apr 2018 12:23:30 +0200
Subject: [PATCH 338/383] #47180 Report install/uninstall events in extension
 management

---
 .../node/extensionManagementService.ts        | 52 +++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 7418a9e3985..cb95dff7fd3 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -22,7 +22,7 @@ import {
 	IExtensionIdentifier,
 	IReportedExtension
 } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getLocalExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { localizeManifest } from '../common/extensionNls';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Limiter, always } from 'vs/base/common/async';
@@ -37,6 +37,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { ExtensionsLifecycle } from 'vs/platform/extensionManagement/node/extensionLifecycle';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
 const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
@@ -49,7 +50,7 @@ const INSTALL_ERROR_GALLERY = 'gallery';
 const INSTALL_ERROR_LOCAL = 'local';
 const INSTALL_ERROR_EXTRACTING = 'extracting';
 const INSTALL_ERROR_DELETING = 'deleting';
-const INSTALL_ERROR_UNKNOWN = 'unknown';
+const ERROR_UNKNOWN = 'unknown';
 
 export class ExtensionManagementError extends Error {
 	constructor(message: string, readonly code: string) {
@@ -108,6 +109,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private uninstalledFileLimiter: Limiter<void>;
 	private reportedExtensions: TPromise<IReportedExtension[]> | undefined;
 	private lastReportTimestamp = 0;
+	private readonly installationStartTime: Map<string, number> = new Map<string, number>();
 	private readonly installingExtensions: Map<string, TPromise<ILocalExtension>> = new Map<string, TPromise<ILocalExtension>>();
 	private readonly manifestCache: ExtensionsManifestCache;
 	private readonly extensionLifecycle: ExtensionsLifecycle;
@@ -128,7 +130,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IDialogService private dialogService: IDialogService,
 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
-		@ILogService private logService: ILogService
+		@ILogService private logService: ILogService,
+		@ITelemetryService private telemetryService: ITelemetryService,
 	) {
 		super();
 		this.extensionsPath = environmentService.extensionsPath;
@@ -326,6 +329,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private onInstallExtensions(extensions: IGalleryExtension[]): void {
 		for (const extension of extensions) {
 			this.logService.info('Installing extension:', extension.name);
+			this.installationStartTime.set(extension.identifier.id, new Date().getTime());
 			const id = getLocalExtensionIdFromGallery(extension, extension.version);
 			this._onInstallExtension.fire({ identifier: { id, uuid: extension.identifier.uuid }, gallery: extension });
 		}
@@ -340,10 +344,13 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				this.logService.info(`Extensions installed successfully:`, gallery.identifier.id);
 				this._onDidInstallExtension.fire({ identifier, gallery, local });
 			} else {
-				const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : INSTALL_ERROR_UNKNOWN;
+				const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : ERROR_UNKNOWN;
 				this.logService.error(`Failed to install extension:`, gallery.identifier.id, error ? error.message : errorCode);
 				this._onDidInstallExtension.fire({ identifier, gallery, error: errorCode });
 			}
+			const startTime = this.installationStartTime.get(gallery.identifier.id);
+			this.reportTelemetry('extensionGallery:install', getGalleryExtensionTelemetryData(gallery), startTime ? new Date().getTime() - startTime : void 0, error);
+			this.installationStartTime.delete(gallery.identifier.id);
 		});
 		return errors.length ? TPromise.wrapError(this.joinErrors(errors)) : TPromise.as(null);
 	}
@@ -524,7 +531,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			.then(() => this.hasDependencies(extension, installed) ? this.promptForDependenciesAndUninstall(extension, installed, force) : this.promptAndUninstall(extension, installed, force))
 			.then(() => this.postUninstallExtension(extension),
 				error => {
-					this.postUninstallExtension(extension, INSTALL_ERROR_LOCAL);
+					this.postUninstallExtension(extension, new ExtensionManagementError(error instanceof Error ? error.message : error, INSTALL_ERROR_LOCAL));
 					return TPromise.wrapError(error);
 				});
 	}
@@ -644,7 +651,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			.then(() => this.uninstallExtension(extension))
 			.then(() => this.postUninstallExtension(extension),
 				error => {
-					this.postUninstallExtension(extension, INSTALL_ERROR_LOCAL);
+					this.postUninstallExtension(extension, new ExtensionManagementError(error instanceof Error ? error.message : error, INSTALL_ERROR_LOCAL));
 					return TPromise.wrapError(error);
 				});
 	}
@@ -664,9 +671,9 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			.then(userExtensions => this.setUninstalled(...userExtensions.filter(u => areSameExtensions({ id: getGalleryExtensionIdFromLocal(u), uuid: u.identifier.uuid }, { id: getGalleryExtensionIdFromLocal(local), uuid: local.identifier.uuid }))));
 	}
 
-	private async postUninstallExtension(extension: ILocalExtension, error?: string): TPromise<void> {
+	private async postUninstallExtension(extension: ILocalExtension, error?: Error): TPromise<void> {
 		if (error) {
-			this.logService.error('Failed to uninstall extension:', extension.identifier.id, error);
+			this.logService.error('Failed to uninstall extension:', extension.identifier.id, error.message);
 		} else {
 			this.logService.info('Successfully uninstalled extension:', extension.identifier.id);
 			// only report if extension has a mapped gallery extension. UUID identifies the gallery extension.
@@ -674,7 +681,9 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				await this.galleryService.reportStatistic(extension.manifest.publisher, extension.manifest.name, extension.manifest.version, StatisticType.Uninstall);
 			}
 		}
-		this._onDidUninstallExtension.fire({ identifier: extension.identifier, error });
+		this.reportTelemetry('extensionGallery:uninstall', getLocalExtensionTelemetryData(extension), void 0, error);
+		const errorcode = error ? error instanceof ExtensionManagementError ? error.code : ERROR_UNKNOWN : void 0;
+		this._onDidUninstallExtension.fire({ identifier: extension.identifier, error: errorcode });
 	}
 
 	getInstalled(type: LocalExtensionType = null): TPromise<ILocalExtension[]> {
@@ -852,6 +861,31 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				return [];
 			});
 	}
+
+	private reportTelemetry(eventName: string, extensionData: any, duration: number, error?: Error): void {
+		const errorcode = error ? error instanceof ExtensionManagementError ? error.code : ERROR_UNKNOWN : void 0;
+		/* __GDPR__
+			"extensionGallery:install" : {
+				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
+		/* __GDPR__
+			"extensionGallery:uninstall" : {
+				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
+		this.telemetryService.publicLog(eventName, assign(extensionData, { success: !error, duration, errorcode }));
+	}
 }
 
 export function getLocalExtensionIdFromGallery(extension: IGalleryExtension, version: string): string {

From db7ddfd9a01370b9a2aa2c7e1beb22bcc16c0606 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 5 Apr 2018 12:30:17 +0200
Subject: [PATCH 339/383] Error code for rename

---
 .../extensionManagement/node/extensionManagementService.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index cb95dff7fd3..29940b2d94e 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -49,6 +49,7 @@ const INSTALL_ERROR_VALIDATING = 'validating';
 const INSTALL_ERROR_GALLERY = 'gallery';
 const INSTALL_ERROR_LOCAL = 'local';
 const INSTALL_ERROR_EXTRACTING = 'extracting';
+const INSTALL_ERROR_RENAMING = 'renaming';
 const INSTALL_ERROR_DELETING = 'deleting';
 const ERROR_UNKNOWN = 'unknown';
 
@@ -452,7 +453,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			.then(null, error =>
 				isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil
 					? this.rename(id, extractPath, renamePath, retryUntil)
-					: TPromise.wrapError(error)
+					: TPromise.wrapError(new ExtensionManagementError(error.message || nls.localize('renameError', "Unknown error while"), error.code || INSTALL_ERROR_RENAMING))
 			);
 	}
 

From 7dc5e68852536e1627736452557feab9c2fb7dc7 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 5 Apr 2018 12:41:29 +0200
Subject: [PATCH 340/383] #46750 Mark extensions.autoUpdate as application
 setting

---
 .../extensions/electron-browser/extensions.contribution.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
index 9fcd5142a61..17911ae1a23 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -29,7 +29,7 @@ import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } f
 import { ExtensionEditor } from 'vs/workbench/parts/extensions/electron-browser/extensionEditor';
 import { StatusUpdater, ExtensionsViewlet, MaliciousExtensionChecker } from 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet';
 import { IQuickOpenRegistry, Extensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -204,7 +204,8 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 			'extensions.autoUpdate': {
 				type: 'boolean',
 				description: localize('extensionsAutoUpdate', "Automatically update extensions"),
-				default: true
+				default: true,
+				scope: ConfigurationScope.APPLICATION
 			},
 			'extensions.ignoreRecommendations': {
 				type: 'boolean',

From 1e5c0c3e4e11af82e82d7761d7875646d1c6336b Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 5 Apr 2018 13:00:38 +0200
Subject: [PATCH 341/383] Remove back up buffered output channel

---
 .../output/electron-browser/outputServices.ts | 162 +-----------------
 1 file changed, 5 insertions(+), 157 deletions(-)

diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
index 9fd70a0a2f6..b8d2a78d4a1 100644
--- a/src/vs/workbench/parts/output/electron-browser/outputServices.ts
+++ b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
@@ -5,7 +5,6 @@
 
 import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';
-import * as strings from 'vs/base/common/strings';
 import * as extfs from 'vs/base/node/extfs';
 import * as fs from 'fs';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -16,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorOptions } from 'vs/workbench/common/editor';
-import { IOutputChannelIdentifier, IOutputChannel, IOutputService, Extensions, OUTPUT_PANEL_ID, IOutputChannelRegistry, OUTPUT_SCHEME, OUTPUT_MIME, MAX_OUTPUT_LENGTH, LOG_SCHEME, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT } from 'vs/workbench/parts/output/common/output';
+import { IOutputChannelIdentifier, IOutputChannel, IOutputService, Extensions, OUTPUT_PANEL_ID, IOutputChannelRegistry, OUTPUT_SCHEME, OUTPUT_MIME, LOG_SCHEME, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT } from 'vs/workbench/parts/output/common/output';
 import { OutputPanel } from 'vs/workbench/parts/output/browser/outputPanel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -36,8 +35,6 @@ import { RotatingLogger } from 'spdlog';
 import { toLocalISOString } from 'vs/base/common/date';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ILogService } from 'vs/platform/log/common/log';
-import { binarySearch } from 'vs/base/common/arrays';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Schemas } from 'vs/base/common/network';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -437,7 +434,6 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IWindowService windowService: IWindowService,
-		@ITelemetryService private telemetryService: ITelemetryService,
 		@ILogService private logService: ILogService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
@@ -570,16 +566,9 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		}
 
 		const uri = URI.from({ scheme: OUTPUT_SCHEME, path: id });
-		if (channelData && channelData.file) {
-			return this.instantiationService.createInstance(FileOutputChannel, channelData, uri);
-		}
-		try {
-			return this.instantiationService.createInstance(OutputChannelBackedByFile, { id, label: channelData ? channelData.label : '' }, this.outputDir, uri);
-		} catch (e) {
-			this.logService.error(e);
-			this.telemetryService.publicLog('output.used.bufferedChannel');
-			return this.instantiationService.createInstance(BufferredOutputChannel, { id, label: channelData ? channelData.label : '' });
-		}
+		return channelData && channelData.file
+			? this.instantiationService.createInstance(FileOutputChannel, channelData, uri)
+			: this.instantiationService.createInstance(OutputChannelBackedByFile, { id, label: channelData ? channelData.label : '' }, this.outputDir, uri);
 	}
 
 	private doShowChannel(channel: IOutputChannel, preserveFocus: boolean): TPromise<void> {
@@ -647,145 +636,4 @@ export class LogContentProvider {
 		}
 		return channel;
 	}
-}
-
-// Remove this channel when there are no issues using Output channel backed by file
-class BufferredOutputChannel extends Disposable implements OutputChannel {
-
-	readonly id: string;
-	readonly label: string;
-	readonly file: URI = null;
-	scrollLock: boolean = false;
-
-	protected _onDidAppendedContent: Emitter<void> = new Emitter<void>();
-	readonly onDidAppendedContent: Event<void> = this._onDidAppendedContent.event;
-
-	private readonly _onDispose: Emitter<void> = new Emitter<void>();
-	readonly onDispose: Event<void> = this._onDispose.event;
-
-	private modelUpdater: RunOnceScheduler;
-	private model: ITextModel;
-	private readonly bufferredContent: BufferedContent;
-	private lastReadId: number = void 0;
-
-	constructor(
-		protected readonly outputChannelIdentifier: IOutputChannelIdentifier,
-		@IModelService private modelService: IModelService,
-		@IModeService private modeService: IModeService
-	) {
-		super();
-
-		this.id = outputChannelIdentifier.id;
-		this.label = outputChannelIdentifier.label;
-
-		this.modelUpdater = new RunOnceScheduler(() => this.updateModel(), 300);
-		this._register(toDisposable(() => this.modelUpdater.cancel()));
-
-		this.bufferredContent = new BufferedContent();
-		this._register(toDisposable(() => this.bufferredContent.clear()));
-	}
-
-	append(output: string) {
-		this.bufferredContent.append(output);
-		if (!this.modelUpdater.isScheduled()) {
-			this.modelUpdater.schedule();
-		}
-	}
-
-	clear(): void {
-		if (this.modelUpdater.isScheduled()) {
-			this.modelUpdater.cancel();
-		}
-		if (this.model) {
-			this.model.setValue('');
-		}
-		this.bufferredContent.clear();
-		this.lastReadId = void 0;
-	}
-
-	loadModel(): TPromise<ITextModel> {
-		const { value, id } = this.bufferredContent.getDelta(this.lastReadId);
-		if (this.model) {
-			this.model.setValue(value);
-		} else {
-			this.model = this.createModel(value);
-		}
-		this.lastReadId = id;
-		return TPromise.as(this.model);
-	}
-
-	private createModel(content: string): ITextModel {
-		const model = this.modelService.createModel(content, this.modeService.getOrCreateMode(OUTPUT_MIME), URI.from({ scheme: OUTPUT_SCHEME, path: this.id }));
-		const disposables: IDisposable[] = [];
-		disposables.push(model.onWillDispose(() => {
-			this.model = null;
-			dispose(disposables);
-		}));
-		return model;
-	}
-
-	private updateModel(): void {
-		if (this.model) {
-			const { value, id } = this.bufferredContent.getDelta(this.lastReadId);
-			this.lastReadId = id;
-			const lastLine = this.model.getLineCount();
-			const lastLineMaxColumn = this.model.getLineMaxColumn(lastLine);
-			this.model.applyEdits([EditOperation.insert(new Position(lastLine, lastLineMaxColumn), value)]);
-			this._onDidAppendedContent.fire();
-		}
-	}
-
-	dispose(): void {
-		this._onDispose.fire();
-		super.dispose();
-	}
-}
-
-class BufferedContent {
-
-	private data: string[] = [];
-	private dataIds: number[] = [];
-	private idPool = 0;
-	private length = 0;
-
-	public append(content: string): void {
-		this.data.push(content);
-		this.dataIds.push(++this.idPool);
-		this.length += content.length;
-		this.trim();
-	}
-
-	public clear(): void {
-		this.data.length = 0;
-		this.dataIds.length = 0;
-		this.length = 0;
-	}
-
-	private trim(): void {
-		if (this.length < MAX_OUTPUT_LENGTH * 1.2) {
-			return;
-		}
-
-		while (this.length > MAX_OUTPUT_LENGTH) {
-			this.dataIds.shift();
-			const removed = this.data.shift();
-			this.length -= removed.length;
-		}
-	}
-
-	public getDelta(previousId?: number): { value: string, id: number } {
-		let idx = -1;
-		if (previousId !== void 0) {
-			idx = binarySearch(this.dataIds, previousId, (a, b) => a - b);
-		}
-
-		const id = this.idPool;
-		if (idx >= 0) {
-			const value = strings.removeAnsiEscapeCodes(this.data.slice(idx + 1).join(''));
-			return { value, id };
-		} else {
-			const value = strings.removeAnsiEscapeCodes(this.data.join(''));
-			return { value, id };
-		}
-	}
-}
+}
\ No newline at end of file

From 0a969c743c89459cd213fcd3cc2c8bd50449ab64 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 5 Apr 2018 07:39:18 -0700
Subject: [PATCH 342/383] Move terminal theming to a theme participant

Fixes #45501
---
 .../electron-browser/terminalColorRegistry.ts |  1 -
 .../electron-browser/terminalPanel.ts         | 54 +++++++++----------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
index fc8a72b6980..0d5fb389afa 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
@@ -165,5 +165,4 @@ export function registerColors(): void {
 		let colorName = id.substring(13);
 		ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, nls.localize('terminal.ansiColor', '\'{0}\' ANSI color in the terminal.', colorName));
 	}
-
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index 336d07d9a95..35623e30433 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -15,7 +15,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ITerminalService, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal';
-import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
+import { IThemeService, ITheme, registerThemingParticipant, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { TerminalFindWidget } from './terminalFindWidget';
 import { editorHoverBackground, editorHoverBorder, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { KillTerminalAction, SwitchTerminalAction, SwitchTerminalActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction, CreateNewTerminalAction, SplitTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
@@ -37,7 +37,6 @@ export class TerminalPanel extends Panel {
 	private _fontStyleElement: HTMLElement;
 	private _parentDomElement: HTMLElement;
 	private _terminalContainer: HTMLElement;
-	private _themeStyleElement: HTMLElement;
 	private _findWidget: TerminalFindWidget;
 
 	constructor(
@@ -56,7 +55,6 @@ export class TerminalPanel extends Panel {
 		super.create(parent);
 		this._parentDomElement = parent;
 		dom.addClass(this._parentDomElement, 'integrated-terminal');
-		this._themeStyleElement = document.createElement('style');
 		this._fontStyleElement = document.createElement('style');
 
 		this._terminalContainer = document.createElement('div');
@@ -64,7 +62,6 @@ export class TerminalPanel extends Panel {
 
 		this._findWidget = this._instantiationService.createInstance(TerminalFindWidget);
 
-		this._parentDomElement.appendChild(this._themeStyleElement);
 		this._parentDomElement.appendChild(this._fontStyleElement);
 		this._parentDomElement.appendChild(this._terminalContainer);
 		this._parentDomElement.appendChild(this._findWidget.getDomNode());
@@ -303,31 +300,6 @@ export class TerminalPanel extends Panel {
 			theme = this.themeService.getTheme();
 		}
 
-		let css = '';
-
-		const backgroundColor = theme.getColor(TERMINAL_BACKGROUND_COLOR) || theme.getColor(PANEL_BACKGROUND);
-		this._terminalContainer.style.backgroundColor = backgroundColor ? backgroundColor.toString() : '';
-
-		const borderColor = theme.getColor(TERMINAL_BORDER_COLOR) || theme.getColor(PANEL_BORDER);
-		if (borderColor) {
-			css += `.monaco-workbench .panel.integrated-terminal .split-view-view:not(:first-child) { border-color: ${borderColor.toString()}; }`;
-		}
-
-		// Borrow the editor's hover background for now
-		let hoverBackground = theme.getColor(editorHoverBackground);
-		if (hoverBackground) {
-			css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`;
-		}
-		let hoverBorder = theme.getColor(editorHoverBorder);
-		if (hoverBorder) {
-			css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`;
-		}
-		let hoverForeground = theme.getColor(editorForeground);
-		if (hoverForeground) {
-			css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { color: ${hoverForeground}; }`;
-		}
-
-		this._themeStyleElement.innerHTML = css;
 		this._findWidget.updateTheme(theme);
 	}
 
@@ -364,3 +336,27 @@ export class TerminalPanel extends Panel {
 		return path;
 	}
 }
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const backgroundColor = theme.getColor(TERMINAL_BACKGROUND_COLOR) || theme.getColor(PANEL_BACKGROUND);
+	collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-outer-container { background-color: ${backgroundColor ? backgroundColor.toString() : ''}; }`);
+
+	const borderColor = theme.getColor(TERMINAL_BORDER_COLOR) || theme.getColor(PANEL_BORDER);
+	if (borderColor) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .split-view-view:not(:first-child) { border-color: ${borderColor.toString()}; }`);
+	}
+
+	// Borrow the editor's hover background for now
+	let hoverBackground = theme.getColor(editorHoverBackground);
+	if (hoverBackground) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`);
+	}
+	let hoverBorder = theme.getColor(editorHoverBorder);
+	if (hoverBorder) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`);
+	}
+	let hoverForeground = theme.getColor(editorForeground);
+	if (hoverForeground) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { color: ${hoverForeground}; }`);
+	}
+});
\ No newline at end of file

From 2f25cb83e0df2b17429a61138f3ab7a33094c371 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 5 Apr 2018 07:55:10 -0700
Subject: [PATCH 343/383] Focus terminal after select/scroll to commands

Fixes #46961
---
 .../parts/terminal/electron-browser/terminalActions.ts        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 671970a7183..a059d742659 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -1064,6 +1064,7 @@ export class ScrollToPreviousCommandAction extends Action {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
 			instance.commandTracker.scrollToPreviousCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}
@@ -1084,6 +1085,7 @@ export class ScrollToNextCommandAction extends Action {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
 			instance.commandTracker.scrollToNextCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}
@@ -1104,6 +1106,7 @@ export class SelectToPreviousCommandAction extends Action {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
 			instance.commandTracker.selectToPreviousCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}
@@ -1124,6 +1127,7 @@ export class SelectToNextCommandAction extends Action {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
 			instance.commandTracker.selectToNextCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}

From dc97c9d819bd0905f6f64803539783f7b04f5d68 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 5 Apr 2018 17:01:51 +0200
Subject: [PATCH 344/383] Fix #29078

---
 build/lib/i18n.resources.json                 |   4 +
 .../browser/parts/editor/editorStatus.ts      |   5 +-
 .../workbench/electron-browser/workbench.ts   |   5 +
 .../debugConfigurationManager.ts              |   2 +-
 .../files/browser/editors/textFileEditor.ts   |   2 +-
 .../preferences/browser/keybindingsEditor.ts  |  35 +---
 .../preferences/browser/preferencesActions.ts |   2 +-
 .../preferences/browser/preferencesEditor.ts  |  57 +-----
 .../browser/preferencesRenderers.ts           |   5 +-
 .../preferences/browser/preferencesWidgets.ts |   2 +-
 .../parts/preferences/common/preferences.ts   | 187 ++----------------
 .../common/preferencesContribution.ts         |   2 +-
 .../preferences.contribution.ts               |  11 +-
 .../electron-browser/preferencesSearch.ts     |   3 +-
 .../parts/search/browser/searchView.ts        |   2 +-
 ...supportedWorkspaceSettings.contribution.ts |   2 +-
 .../preferences/browser/preferencesService.ts |   8 +-
 .../common/keybindingsEditorModel.ts          |   0
 .../preferences/common/preferences.ts         | 163 +++++++++++++++
 .../common/preferencesEditorInput.ts          |  83 ++++++++
 .../preferences/common/preferencesModels.ts   |   2 +-
 .../common/keybindingsEditorModel.test.ts     |   2 +-
 22 files changed, 311 insertions(+), 273 deletions(-)
 rename src/vs/workbench/{parts => services}/preferences/browser/preferencesService.ts (98%)
 rename src/vs/workbench/{parts => services}/preferences/common/keybindingsEditorModel.ts (100%)
 create mode 100644 src/vs/workbench/services/preferences/common/preferences.ts
 create mode 100644 src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
 rename src/vs/workbench/{parts => services}/preferences/common/preferencesModels.ts (99%)
 rename src/vs/workbench/{parts => services}/preferences/test/common/keybindingsEditorModel.test.ts (99%)

diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index 9de72cc968d..18567d3f995 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -209,6 +209,10 @@
 		{
 			"name": "vs/workbench/services/decorations",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/preferences",
+			"project": "vscode-preferences"
 		}
 	]
 }
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 95974fc7d85..6476c972704 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -59,10 +59,7 @@ import { Button } from 'vs/base/browser/ui/button/button';
 import { Schemas } from 'vs/base/common/network';
 import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { Themable } from 'vs/workbench/common/theme';
-
-// TODO@Sandeep layer breaker
-// tslint:disable-next-line:import-patterns
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
 class SideBySideEditorEncodingSupport implements IEncodingSupport {
 	constructor(private master: IEncodingSupport, private details: IEncodingSupport) { }
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index e4e9cc79e7f..cdb6879f8a6 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -106,6 +106,8 @@ import { NotificationsAlerts } from 'vs/workbench/browser/parts/notifications/no
 import { NotificationsStatus } from 'vs/workbench/browser/parts/notifications/notificationsStatus';
 import { registerNotificationCommands } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService';
 
 export const EditorsVisibleContext = new RawContextKey<boolean>('editorIsOpen', false);
 export const InZenModeContext = new RawContextKey<boolean>('inZenMode', false);
@@ -631,6 +633,9 @@ export class Workbench implements IPartService {
 		this.toUnbind.push({ dispose: () => this.quickInput.shutdown() });
 		serviceCollection.set(IQuickInputService, this.quickInput);
 
+		// PreferencesService
+		serviceCollection.set(IPreferencesService, this.instantiationService.createInstance(PreferencesService));
+
 		// Contributed services
 		const contributedServices = getServices();
 		for (let contributedService of contributedServices) {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 92dcad553fb..2ab01a3c8af 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -33,7 +33,7 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
 // debuggers extension point
 export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawAdapter[]>('debuggers', [], {
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 86e9ed3134a..c29555ab1d7 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -24,7 +24,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index ea9696016b3..9511b94d628 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -16,16 +16,16 @@ import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLa
 import { IAction } from 'vs/base/common/actions';
 import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { EditorOptions } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { KeybindingsEditorModel, IKeybindingItemEntry, IListEntry, KEYBINDING_ENTRY_TEMPLATE_ID, KEYBINDING_HEADER_TEMPLATE_ID } from 'vs/workbench/parts/preferences/common/keybindingsEditorModel';
+import { KeybindingsEditorModel, IKeybindingItemEntry, IListEntry, KEYBINDING_ENTRY_TEMPLATE_ID, KEYBINDING_HEADER_TEMPLATE_ID } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService, IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { SearchWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { DefineKeybindingWidget } from 'vs/workbench/parts/preferences/browser/keybindingWidgets';
 import {
-	IPreferencesService, IKeybindingsEditor, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_COPY,
+	IKeybindingsEditor, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_COPY,
 	KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS,
 	KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS
 } from 'vs/workbench/parts/preferences/common/preferences';
@@ -42,36 +42,11 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 
 let $ = DOM.$;
 
-export class KeybindingsEditorInput extends EditorInput {
-
-	public static readonly ID: string = 'workbench.input.keybindings';
-	public readonly keybindingsModel: KeybindingsEditorModel;
-
-	constructor(@IInstantiationService instantiationService: IInstantiationService) {
-		super();
-		this.keybindingsModel = instantiationService.createInstance(KeybindingsEditorModel, OS);
-	}
-
-	getTypeId(): string {
-		return KeybindingsEditorInput.ID;
-	}
-
-	getName(): string {
-		return localize('keybindingsInputName', "Keyboard Shortcuts");
-	}
-
-	resolve(refresh?: boolean): TPromise<KeybindingsEditorModel> {
-		return TPromise.as(this.keybindingsModel);
-	}
-
-	matches(otherInput: any): boolean {
-		return otherInput instanceof KeybindingsEditorInput;
-	}
-}
-
 export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor {
 
 	public static readonly ID: string = 'workbench.editor.keybindings';
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
index 0399b803ed0..582ce7a3d74 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
@@ -11,7 +11,7 @@ import { Action } from 'vs/base/common/actions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IQuickOpenService, IPickOpenEntry, IFilePickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index fb19dd05d4d..a66932f4810 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -14,20 +14,22 @@ import * as arrays from 'vs/base/common/arrays';
 import { ArrayNavigator } from 'vs/base/common/iterator';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { SideBySideEditorInput, EditorOptions, EditorInput, PREFERENCES_EDITOR_ID } from 'vs/workbench/common/editor';
+import { EditorOptions, EditorInput, PREFERENCES_EDITOR_ID } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
-import { IEditorControl, Position, Verbosity } from 'vs/platform/editor/common/editor';
-import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
+import { IEditorControl, Position } from 'vs/platform/editor/common/editor';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
 import { CodeEditor } from 'vs/editor/browser/codeEditor';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import {
-	IPreferencesService, ISettingsGroup, ISetting, IFilterResult, IPreferencesSearchService,
-	CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, SETTINGS_EDITOR_COMMAND_SEARCH, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, ISettingsEditorModel, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, ISearchProvider, ISearchResult, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING
+	IPreferencesSearchService,
+	CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, SETTINGS_EDITOR_COMMAND_SEARCH, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, ISearchProvider, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING
 } from 'vs/workbench/parts/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
+import {
+	IPreferencesService, ISettingsGroup, ISetting, IFilterResult, ISettingsEditorModel, ISearchResult
+} from 'vs/workbench/services/preferences/common/preferences';
+import { SettingsEditorModel, DefaultSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { SearchWidget, SettingsTargetsWidget, SettingsTarget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { ContextKeyExpr, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -37,7 +39,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { VSash } from 'vs/base/browser/ui/sash/sash';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { IPreferencesRenderer, DefaultSettingsRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer, FolderSettingsRenderer } from 'vs/workbench/parts/preferences/browser/preferencesRenderers';
@@ -56,50 +57,10 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { MessageController } from 'vs/editor/contrib/message/messageController';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ILogService } from 'vs/platform/log/common/log';
-
-export class PreferencesEditorInput extends SideBySideEditorInput {
-	public static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
-
-	getTypeId(): string {
-		return PreferencesEditorInput.ID;
-	}
-
-	public supportsSplitEditor(): boolean {
-		return true;
-	}
-
-	public getTitle(verbosity: Verbosity): string {
-		return this.master.getTitle(verbosity);
-	}
-}
-
-export class DefaultPreferencesEditorInput extends ResourceEditorInput {
-	public static readonly ID = 'workbench.editorinputs.defaultpreferences';
-	constructor(defaultSettingsResource: URI,
-		@ITextModelService textModelResolverService: ITextModelService,
-		@IHashService hashService: IHashService
-	) {
-		super(nls.localize('settingsEditorName', "Default Settings"), '', defaultSettingsResource, textModelResolverService, hashService);
-	}
-
-	getTypeId(): string {
-		return DefaultPreferencesEditorInput.ID;
-	}
-
-	matches(other: any): boolean {
-		if (other instanceof DefaultPreferencesEditorInput) {
-			return true;
-		}
-		if (!super.matches(other)) {
-			return false;
-		}
-		return true;
-	}
-}
+import { PreferencesEditorInput, DefaultPreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 
 export class PreferencesEditor extends BaseEditor {
 
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index f033c84ab3e..9d00c6f1c5a 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -18,8 +18,8 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IWorkbenchSettingsConfiguration, IExtensionSetting, IScoredResults } from 'vs/workbench/parts/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
+import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IExtensionSetting, IScoredResults } from 'vs/workbench/services/preferences/common/preferences';
+import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { SettingsGroupTitleWidget, EditPreferenceWidget, SettingsHeaderWidget, DefaultSettingsHeaderWidget, FloatingClickWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
@@ -41,6 +41,7 @@ import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ContextSubMenu } from 'vs/base/browser/contextmenu';
+import { IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences';
 
 export interface IPreferencesRenderer<T> extends IDisposable {
 	readonly preferencesModel: IPreferencesEditorModel<T>;
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
index a33dee8823a..d9d49c7586b 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
@@ -17,7 +17,7 @@ import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPosit
 import { InputBox, IInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ISettingsGroup } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IAction, Action } from 'vs/base/common/actions';
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index 17f2dae6ffb..556403aa562 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -3,21 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEditor, Position, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { ITextModel } from 'vs/editor/common/model';
-import { IKeybindingItemEntry } from 'vs/workbench/parts/preferences/common/keybindingsEditorModel';
-import { IRange } from 'vs/editor/common/core/range';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { join } from 'vs/base/common/paths';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { Event } from 'vs/base/common/event';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ISettingsEditorModel, ISearchResult } from 'vs/workbench/services/preferences/common/preferences';
+import { IEditor } from 'vs/platform/editor/common/editor';
+import { IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
 
 export interface IWorkbenchSettingsConfiguration {
 	workbench: {
@@ -33,164 +25,6 @@ export interface IWorkbenchSettingsConfiguration {
 	};
 }
 
-export interface ISettingsGroup {
-	id: string;
-	range: IRange;
-	title: string;
-	titleRange: IRange;
-	sections: ISettingsSection[];
-}
-
-export interface ISettingsSection {
-	titleRange?: IRange;
-	title?: string;
-	settings: ISetting[];
-}
-
-export interface ISetting {
-	range: IRange;
-	key: string;
-	keyRange: IRange;
-	value: any;
-	valueRange: IRange;
-	description: string[];
-	descriptionRanges: IRange[];
-	overrides?: ISetting[];
-	overrideOf?: ISetting;
-}
-
-export interface IExtensionSetting extends ISetting {
-	extensionName: string;
-	extensionPublisher: string;
-}
-
-export interface ISearchResult {
-	filterMatches: ISettingMatch[];
-	metadata?: IFilterMetadata;
-}
-
-export interface ISearchResultGroup {
-	id: string;
-	label: string;
-	result: ISearchResult;
-	order: number;
-}
-
-export interface IFilterResult {
-	query?: string;
-	filteredGroups: ISettingsGroup[];
-	allGroups: ISettingsGroup[];
-	matches: IRange[];
-	metadata?: IStringDictionary<IFilterMetadata>;
-}
-
-export interface ISettingMatch {
-	setting: ISetting;
-	matches: IRange[];
-	score: number;
-}
-
-export interface IScoredResults {
-	[key: string]: IRemoteSetting;
-}
-
-export interface IRemoteSetting {
-	score: number;
-	key: string;
-	id: string;
-	defaultValue: string;
-	description: string;
-	packageId: string;
-	extensionName?: string;
-	extensionPublisher?: string;
-}
-
-export interface IFilterMetadata {
-	requestUrl: string;
-	requestBody: string;
-	timestamp: number;
-	duration: number;
-	scoredResults: IScoredResults;
-	extensions?: ILocalExtension[];
-
-	/** The number of requests made, since requests are split by number of filters */
-	requestCount?: number;
-
-	/** The name of the server that actually served the request */
-	context: string;
-}
-
-export interface IPreferencesEditorModel<T> {
-	uri: URI;
-	getPreference(key: string): T;
-	dispose(): void;
-}
-
-export type IGroupFilter = (group: ISettingsGroup) => boolean;
-export type ISettingMatcher = (setting: ISetting, group: ISettingsGroup) => { matches: IRange[], score: number };
-
-export interface ISettingsEditorModel extends IPreferencesEditorModel<ISetting> {
-	readonly onDidChangeGroups: Event<void>;
-	settingsGroups: ISettingsGroup[];
-	filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[];
-	findValueMatches(filter: string, setting: ISetting): IRange[];
-	updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult;
-}
-
-export interface IKeybindingsEditorModel<T> extends IPreferencesEditorModel<T> {
-}
-
-export const IPreferencesService = createDecorator<IPreferencesService>('preferencesService');
-
-export interface IPreferencesService {
-	_serviceBrand: any;
-
-	userSettingsResource: URI;
-	workspaceSettingsResource: URI;
-	getFolderSettingsResource(resource: URI): URI;
-
-	resolveModel(uri: URI): TPromise<ITextModel>;
-	createPreferencesEditorModel<T>(uri: URI): TPromise<IPreferencesEditorModel<T>>;
-
-	openRawDefaultSettings(): TPromise<void>;
-	openGlobalSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
-	openWorkspaceSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
-	openFolderSettings(folder: URI, options?: IEditorOptions, position?: Position): TPromise<IEditor>;
-	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void>;
-	openGlobalKeybindingSettings(textual: boolean): TPromise<void>;
-
-	configureSettingsForLanguage(language: string): void;
-}
-
-
-export interface IKeybindingsEditor extends IEditor {
-
-	activeKeybindingEntry: IKeybindingItemEntry;
-
-	search(filter: string): void;
-	clearSearchResults(): void;
-	focusKeybindings(): void;
-	defineKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	removeKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	resetKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	copyKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	copyKeybindingCommand(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	showSimilarKeybindings(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-}
-
-export function getSettingsTargetName(target: ConfigurationTarget, resource: URI, workspaceContextService: IWorkspaceContextService): string {
-	switch (target) {
-		case ConfigurationTarget.USER:
-			return localize('userSettingsTarget', "User Settings");
-		case ConfigurationTarget.WORKSPACE:
-			return localize('workspaceSettingsTarget', "Workspace Settings");
-		case ConfigurationTarget.WORKSPACE_FOLDER:
-			const folder = workspaceContextService.getWorkspaceFolder(resource);
-			return folder ? folder.name : '';
-	}
-	return '';
-}
-
 export interface IEndpointDetails {
 	urlBase: string;
 	key?: string;
@@ -209,6 +43,21 @@ export interface ISearchProvider {
 	searchModel(preferencesModel: ISettingsEditorModel): TPromise<ISearchResult>;
 }
 
+export interface IKeybindingsEditor extends IEditor {
+
+	activeKeybindingEntry: IKeybindingItemEntry;
+
+	search(filter: string): void;
+	clearSearchResults(): void;
+	focusKeybindings(): void;
+	defineKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	removeKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	resetKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	copyKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	copyKeybindingCommand(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	showSimilarKeybindings(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+}
+
 export const CONTEXT_SETTINGS_EDITOR = new RawContextKey<boolean>('inSettingsEditor', false);
 export const CONTEXT_SETTINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inSettingsSearch', false);
 export const CONTEXT_KEYBINDINGS_EDITOR = new RawContextKey<boolean>('inKeybindings', false);
diff --git a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
index adf1fc4a589..09d6aa2c742 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
@@ -13,7 +13,7 @@ import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonCo
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IPreferencesService, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/services/preferences/common/preferences';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { endsWith } from 'vs/base/common/strings';
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
index 50c0e829378..08023834685 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import 'vs/css!../browser/media/preferences';
 import * as nls from 'vs/nls';
 import URI from 'vs/base/common/uri';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -14,14 +15,14 @@ import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { DefaultPreferencesEditorInput, PreferencesEditor, PreferencesEditorInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
-import { KeybindingsEditor, KeybindingsEditorInput } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
+import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
+import { DefaultPreferencesEditorInput, PreferencesEditorInput, KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { KeybindingsEditor } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
 import { OpenRawDefaultSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import {
-	IPreferencesService, IKeybindingsEditor, IPreferencesSearchService, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_SEARCH,
+	IKeybindingsEditor, IPreferencesSearchService, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_SEARCH,
 	KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
 } from 'vs/workbench/parts/preferences/common/preferences';
-import { PreferencesService } from 'vs/workbench/parts/preferences/browser/preferencesService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { PreferencesContribution } from 'vs/workbench/parts/preferences/common/preferencesContribution';
@@ -31,8 +32,8 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { PreferencesSearchService } from 'vs/workbench/parts/preferences/electron-browser/preferencesSearch';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
-registerSingleton(IPreferencesService, PreferencesService);
 registerSingleton(IPreferencesSearchService, PreferencesSearchService);
 
 Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index aa9985fa576..b267d3164aa 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ISettingsEditorModel, ISetting, ISettingsGroup, IWorkbenchSettingsConfiguration, IFilterMetadata, IPreferencesSearchService, ISearchResult, ISearchProvider, IGroupFilter, ISettingMatcher, IScoredResults, ISettingMatch, IRemoteSetting, IExtensionSetting } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsEditorModel, ISetting, ISettingsGroup, IFilterMetadata, ISearchResult, IGroupFilter, ISettingMatcher, IScoredResults, ISettingMatch, IRemoteSetting, IExtensionSetting } from 'vs/workbench/services/preferences/common/preferences';
 import { IRange } from 'vs/editor/common/core/range';
 import { distinct, top } from 'vs/base/common/arrays';
 import * as strings from 'vs/base/common/strings';
@@ -20,6 +20,7 @@ import { asJson } from 'vs/base/node/request';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtensionManagementService, LocalExtensionType, ILocalExtension, IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IPreferencesSearchService, ISearchProvider, IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences';
 
 export interface IEndpointDetails {
 	urlBase: string;
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 44124ae98fd..52aaf31a014 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -23,7 +23,7 @@ import { Builder, $ } from 'vs/base/browser/builder';
 import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
 import { ITree, IFocusEvent } from 'vs/base/parts/tree/browser/tree';
 import { Scope } from 'vs/workbench/common/memento';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { FileChangeType, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
 import { Match, FileMatch, SearchModel, FileMatchOrMatch, IChangeEvent, ISearchWorkbenchService, FolderMatch } from 'vs/workbench/parts/search/common/searchModel';
diff --git a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
index 904c597c9f6..167dd657a8c 100644
--- a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
+++ b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
@@ -10,7 +10,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
similarity index 98%
rename from src/vs/workbench/parts/preferences/browser/preferencesService.ts
rename to src/vs/workbench/services/preferences/browser/preferencesService.ts
index f453fce8e0d..c27f5a63da2 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/preferences';
 import * as network from 'vs/base/common/network';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
@@ -22,11 +21,10 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
 import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IPreferencesService, IPreferencesEditorModel, ISetting, getSettingsTargetName, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/parts/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel, DefaultKeybindingsEditorModel, defaultKeybindingsContents, DefaultSettings, WorkspaceConfigurationEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
+import { IPreferencesService, IPreferencesEditorModel, ISetting, getSettingsTargetName, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/services/preferences/common/preferences';
+import { SettingsEditorModel, DefaultSettingsEditorModel, DefaultKeybindingsEditorModel, defaultKeybindingsContents, DefaultSettings, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DefaultPreferencesEditorInput, PreferencesEditorInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
-import { KeybindingsEditorInput } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
+import { DefaultPreferencesEditorInput, PreferencesEditorInput, KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
diff --git a/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts b/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
similarity index 100%
rename from src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts
rename to src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
new file mode 100644
index 00000000000..20b0fb9b4d0
--- /dev/null
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IEditor, Position, IEditorOptions } from 'vs/platform/editor/common/editor';
+import { ITextModel } from 'vs/editor/common/model';
+import { IRange } from 'vs/editor/common/core/range';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { join } from 'vs/base/common/paths';
+import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { Event } from 'vs/base/common/event';
+import { IStringDictionary } from 'vs/base/common/collections';
+import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { localize } from 'vs/nls';
+
+export interface ISettingsGroup {
+	id: string;
+	range: IRange;
+	title: string;
+	titleRange: IRange;
+	sections: ISettingsSection[];
+}
+
+export interface ISettingsSection {
+	titleRange?: IRange;
+	title?: string;
+	settings: ISetting[];
+}
+
+export interface ISetting {
+	range: IRange;
+	key: string;
+	keyRange: IRange;
+	value: any;
+	valueRange: IRange;
+	description: string[];
+	descriptionRanges: IRange[];
+	overrides?: ISetting[];
+	overrideOf?: ISetting;
+}
+
+export interface IExtensionSetting extends ISetting {
+	extensionName: string;
+	extensionPublisher: string;
+}
+
+export interface ISearchResult {
+	filterMatches: ISettingMatch[];
+	metadata?: IFilterMetadata;
+}
+
+export interface ISearchResultGroup {
+	id: string;
+	label: string;
+	result: ISearchResult;
+	order: number;
+}
+
+export interface IFilterResult {
+	query?: string;
+	filteredGroups: ISettingsGroup[];
+	allGroups: ISettingsGroup[];
+	matches: IRange[];
+	metadata?: IStringDictionary<IFilterMetadata>;
+}
+
+export interface ISettingMatch {
+	setting: ISetting;
+	matches: IRange[];
+	score: number;
+}
+
+export interface IScoredResults {
+	[key: string]: IRemoteSetting;
+}
+
+export interface IRemoteSetting {
+	score: number;
+	key: string;
+	id: string;
+	defaultValue: string;
+	description: string;
+	packageId: string;
+	extensionName?: string;
+	extensionPublisher?: string;
+}
+
+export interface IFilterMetadata {
+	requestUrl: string;
+	requestBody: string;
+	timestamp: number;
+	duration: number;
+	scoredResults: IScoredResults;
+	extensions?: ILocalExtension[];
+
+	/** The number of requests made, since requests are split by number of filters */
+	requestCount?: number;
+
+	/** The name of the server that actually served the request */
+	context: string;
+}
+
+export interface IPreferencesEditorModel<T> {
+	uri: URI;
+	getPreference(key: string): T;
+	dispose(): void;
+}
+
+export type IGroupFilter = (group: ISettingsGroup) => boolean;
+export type ISettingMatcher = (setting: ISetting, group: ISettingsGroup) => { matches: IRange[], score: number };
+
+export interface ISettingsEditorModel extends IPreferencesEditorModel<ISetting> {
+	readonly onDidChangeGroups: Event<void>;
+	settingsGroups: ISettingsGroup[];
+	filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[];
+	findValueMatches(filter: string, setting: ISetting): IRange[];
+	updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult;
+}
+
+export interface IKeybindingsEditorModel<T> extends IPreferencesEditorModel<T> {
+}
+
+export const IPreferencesService = createDecorator<IPreferencesService>('preferencesService');
+
+export interface IPreferencesService {
+	_serviceBrand: any;
+
+	userSettingsResource: URI;
+	workspaceSettingsResource: URI;
+	getFolderSettingsResource(resource: URI): URI;
+
+	resolveModel(uri: URI): TPromise<ITextModel>;
+	createPreferencesEditorModel<T>(uri: URI): TPromise<IPreferencesEditorModel<T>>;
+
+	openRawDefaultSettings(): TPromise<void>;
+	openGlobalSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
+	openWorkspaceSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
+	openFolderSettings(folder: URI, options?: IEditorOptions, position?: Position): TPromise<IEditor>;
+	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void>;
+	openGlobalKeybindingSettings(textual: boolean): TPromise<void>;
+
+	configureSettingsForLanguage(language: string): void;
+}
+
+export function getSettingsTargetName(target: ConfigurationTarget, resource: URI, workspaceContextService: IWorkspaceContextService): string {
+	switch (target) {
+		case ConfigurationTarget.USER:
+			return localize('userSettingsTarget', "User Settings");
+		case ConfigurationTarget.WORKSPACE:
+			return localize('workspaceSettingsTarget', "Workspace Settings");
+		case ConfigurationTarget.WORKSPACE_FOLDER:
+			const folder = workspaceContextService.getWorkspaceFolder(resource);
+			return folder ? folder.name : '';
+	}
+	return '';
+}
+
+export const FOLDER_SETTINGS_PATH = join('.vscode', 'settings.json');
+export const DEFAULT_SETTINGS_EDITOR_SETTING = 'workbench.settings.openDefaultSettings';
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
new file mode 100644
index 00000000000..f8fb62cb73a
--- /dev/null
+++ b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { SideBySideEditorInput, EditorInput } from 'vs/workbench/common/editor';
+import { Verbosity } from 'vs/platform/editor/common/editor';
+import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
+import URI from 'vs/base/common/uri';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IHashService } from 'vs/workbench/services/hash/common/hashService';
+import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { OS } from 'vs/base/common/platform';
+import { TPromise } from 'vs/base/common/winjs.base';
+
+export class PreferencesEditorInput extends SideBySideEditorInput {
+	public static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
+
+	getTypeId(): string {
+		return PreferencesEditorInput.ID;
+	}
+
+	public supportsSplitEditor(): boolean {
+		return true;
+	}
+
+	public getTitle(verbosity: Verbosity): string {
+		return this.master.getTitle(verbosity);
+	}
+}
+
+export class DefaultPreferencesEditorInput extends ResourceEditorInput {
+	public static readonly ID = 'workbench.editorinputs.defaultpreferences';
+	constructor(defaultSettingsResource: URI,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@IHashService hashService: IHashService
+	) {
+		super(nls.localize('settingsEditorName', "Default Settings"), '', defaultSettingsResource, textModelResolverService, hashService);
+	}
+
+	getTypeId(): string {
+		return DefaultPreferencesEditorInput.ID;
+	}
+
+	matches(other: any): boolean {
+		if (other instanceof DefaultPreferencesEditorInput) {
+			return true;
+		}
+		if (!super.matches(other)) {
+			return false;
+		}
+		return true;
+	}
+}
+
+export class KeybindingsEditorInput extends EditorInput {
+
+	public static readonly ID: string = 'workbench.input.keybindings';
+	public readonly keybindingsModel: KeybindingsEditorModel;
+
+	constructor(@IInstantiationService instantiationService: IInstantiationService) {
+		super();
+		this.keybindingsModel = instantiationService.createInstance(KeybindingsEditorModel, OS);
+	}
+
+	getTypeId(): string {
+		return KeybindingsEditorInput.ID;
+	}
+
+	getName(): string {
+		return nls.localize('keybindingsInputName', "Keyboard Shortcuts");
+	}
+
+	resolve(refresh?: boolean): TPromise<KeybindingsEditorModel> {
+		return TPromise.as(this.keybindingsModel);
+	}
+
+	matches(otherInput: any): boolean {
+		return otherInput instanceof KeybindingsEditorInput;
+	}
+}
diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
similarity index 99%
rename from src/vs/workbench/parts/preferences/common/preferencesModels.ts
rename to src/vs/workbench/services/preferences/common/preferencesModels.ts
index 8decbe43134..a3ea720f8b6 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -15,7 +15,7 @@ import { visit, JSONVisitor } from 'vs/base/common/json';
 import { ITextModel, IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
 import { EditorModel } from 'vs/workbench/common/editor';
 import { IConfigurationNode, IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN, IConfigurationPropertySchema, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { ISettingsEditorModel, IKeybindingsEditorModel, ISettingsGroup, ISetting, IFilterResult, IGroupFilter, ISettingMatcher, ISettingMatch, ISearchResultGroup, IFilterMetadata } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsEditorModel, IKeybindingsEditorModel, ISettingsGroup, ISetting, IFilterResult, IGroupFilter, ISettingMatcher, ISettingMatch, ISearchResultGroup, IFilterMetadata } from 'vs/workbench/services/preferences/common/preferences';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { IRange, Range } from 'vs/editor/common/core/range';
diff --git a/src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts b/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
similarity index 99%
rename from src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts
rename to src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
index 195bae94fae..e607fdd1b5f 100644
--- a/src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts
+++ b/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
@@ -16,7 +16,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsEditorModel, IKeybindingItemEntry } from 'vs/workbench/parts/preferences/common/keybindingsEditorModel';
+import { KeybindingsEditorModel, IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
 

From 0dee29f0c839652bf4b00400125018964acaa66a Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 5 Apr 2018 18:08:50 +0200
Subject: [PATCH 345/383] Fix #31039

---
 src/vs/code/electron-main/menus.ts            |  2 +-
 .../preferences/browser/preferencesActions.ts | 18 ++++++++++
 .../preferences.contribution.ts               |  5 +--
 .../parts/update/electron-browser/update.ts   |  2 +-
 .../preferences/browser/preferencesService.ts | 33 ++++++++++++++-----
 .../preferences/common/preferences.ts         |  1 +
 6 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index cf0e42edf02..46d965ac212 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -451,7 +451,7 @@ export class CodeMenu {
 	}
 
 	private getPreferencesMenu(): Electron.MenuItem {
-		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openGlobalSettings');
+		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings');
 		const kebindingSettings = this.createMenuItem(nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts"), 'workbench.action.openGlobalKeybindings');
 		const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
 		const snippetsSettings = this.createMenuItem(nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"), 'workbench.action.openSnippets');
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
index 582ce7a3d74..da2948671a3 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
@@ -34,6 +34,24 @@ export class OpenRawDefaultSettingsAction extends Action {
 	}
 }
 
+export class OpenSettingsAction extends Action {
+
+	public static readonly ID = 'workbench.action.openSettings';
+	public static readonly LABEL = nls.localize('openSettings', "Open Settings");
+
+	constructor(
+		id: string,
+		label: string,
+		@IPreferencesService private preferencesService: IPreferencesService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		return this.preferencesService.openSettings();
+	}
+}
+
 export class OpenGlobalSettingsAction extends Action {
 
 	public static readonly ID = 'workbench.action.openGlobalSettings';
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
index 08023834685..aa1599d77e3 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
@@ -18,7 +18,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { DefaultPreferencesEditorInput, PreferencesEditorInput, KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 import { KeybindingsEditor } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
-import { OpenRawDefaultSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
+import { OpenRawDefaultSettingsAction, OpenSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import {
 	IKeybindingsEditor, IPreferencesSearchService, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_SEARCH,
 	KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
@@ -166,7 +166,8 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 const category = nls.localize('preferences', "Preferences");
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenRawDefaultSettingsAction, OpenRawDefaultSettingsAction.ID, OpenRawDefaultSettingsAction.LABEL), 'Preferences: Open Raw Default Settings', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_COMMA }), 'Preferences: Open User Settings', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(OpenSettingsAction, OpenSettingsAction.ID, OpenSettingsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_COMMA }), 'Preferences: Open Settings', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL), 'Preferences: Open User Settings', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsAction, OpenGlobalKeybindingsAction.ID, OpenGlobalKeybindingsAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_S) }), 'Preferences: Open Keyboard Shortcuts', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsFileAction, OpenGlobalKeybindingsFileAction.ID, OpenGlobalKeybindingsFileAction.LABEL, { primary: null }), 'Preferences: Open Keyboard Shortcuts File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureLanguageBasedSettingsAction, ConfigureLanguageBasedSettingsAction.ID, ConfigureLanguageBasedSettingsAction.LABEL), 'Preferences: Configure Language Specific Settings...', category);
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 8c1ab586a7b..9073b1d8d01 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -223,7 +223,7 @@ class CommandAction extends Action {
 export class UpdateContribution implements IGlobalActivity {
 
 	private static readonly showCommandsId = 'workbench.action.showCommands';
-	private static readonly openSettingsId = 'workbench.action.openGlobalSettings';
+	private static readonly openSettingsId = 'workbench.action.openSettings';
 	private static readonly openKeybindingsId = 'workbench.action.openGlobalKeybindings';
 	private static readonly openUserSnippets = 'workbench.action.openSnippets';
 	private static readonly selectColorThemeId = 'workbench.action.selectTheme';
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index c27f5a63da2..b40e98e924c 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -72,13 +72,6 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		@IModeService private modeService: IModeService
 	) {
 		super();
-		this.editorGroupService.onEditorsChanged(() => {
-			const activeEditorInput = this.editorService.getActiveEditorInput();
-			if (activeEditorInput instanceof PreferencesEditorInput) {
-				this.lastOpenedSettingsInput = activeEditorInput;
-			}
-		});
-
 		// The default keybindings.json updates based on keyboard layouts, so here we make sure
 		// if a model has been given out we update it accordingly.
 		keybindingService.onDidUpdateKeybindings(() => {
@@ -178,6 +171,12 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.editorService.openEditor({ resource: this.defaultSettingsRawResource }, EditorPosition.ONE) as TPromise<any>;
 	}
 
+	openSettings(): TPromise<IEditor> {
+		const resource = this.lastOpenedSettingsInput ? this.lastOpenedSettingsInput.master.getResource() : this.userSettingsResource;
+		const target = this.getConfigurationTargetFromSettingsResource(resource);
+		return this.doOpenSettings(target, resource);
+	}
+
 	openGlobalSettings(options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
 		return this.doOpenSettings(ConfigurationTarget.USER, this.userSettingsResource, options, position);
 	}
@@ -201,7 +200,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 				.then(toInput => {
 					const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
 					return this.editorService.replaceEditors([{
-						toReplace: this.lastOpenedSettingsInput,
+						toReplace: activeEditor.input,
 						replaceWith
 					}], activeEditor.position).then(() => {
 						this.lastOpenedSettingsInput = replaceWith;
@@ -270,6 +269,24 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			});
 	}
 
+	private getConfigurationTargetFromSettingsResource(resource: URI): ConfigurationTarget {
+		if (this.userSettingsResource.toString() === resource.toString()) {
+			return ConfigurationTarget.USER;
+		}
+
+		const workspaceSettingsResource = this.workspaceSettingsResource;
+		if (workspaceSettingsResource && workspaceSettingsResource.toString() === resource.toString()) {
+			return ConfigurationTarget.WORKSPACE;
+		}
+
+		const folder = this.contextService.getWorkspaceFolder(resource);
+		if (folder) {
+			return ConfigurationTarget.WORKSPACE_FOLDER;
+		}
+
+		return ConfigurationTarget.USER;
+	}
+
 	private getConfigurationTargetFromDefaultSettingsResource(uri: URI) {
 		return this.isDefaultWorkspaceSettingsResource(uri) ? ConfigurationTarget.WORKSPACE : this.isDefaultFolderSettingsResource(uri) ? ConfigurationTarget.WORKSPACE_FOLDER : ConfigurationTarget.USER;
 	}
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 20b0fb9b4d0..0a4d82056b0 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -137,6 +137,7 @@ export interface IPreferencesService {
 	createPreferencesEditorModel<T>(uri: URI): TPromise<IPreferencesEditorModel<T>>;
 
 	openRawDefaultSettings(): TPromise<void>;
+	openSettings(): TPromise<IEditor>;
 	openGlobalSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
 	openWorkspaceSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
 	openFolderSettings(folder: URI, options?: IEditorOptions, position?: Position): TPromise<IEditor>;

From 4e2035d4ebbc954f82bf83dc0e8cca3717aeb8f8 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 5 Apr 2018 18:26:24 +0200
Subject: [PATCH 346/383] make sure sequence terminates as soon as formatting
 results are in,

related to  https://github.com/Microsoft/vscode-languageserver-node/issues/305, fyi @dbauemer
---
 src/vs/editor/contrib/format/format.ts        | 32 +++++++++----------
 .../api/extHostLanguageFeatures.test.ts       | 18 ++++++++++-
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
index 3d448d4ae06..bc6ed0f89d9 100644
--- a/src/vs/editor/contrib/format/format.ts
+++ b/src/vs/editor/contrib/format/format.ts
@@ -38,14 +38,14 @@ export function getDocumentRangeFormattingEdits(model: ITextModel, range: Range,
 
 	let result: TextEdit[];
 	return sequence(providers.map(provider => {
-		if (isFalsyOrEmpty(result)) {
-			return () => {
-				return asWinJsPromise(token => provider.provideDocumentRangeFormattingEdits(model, range, options, token)).then(value => {
-					result = value;
-				}, onUnexpectedExternalError);
-			};
-		}
-		return undefined;
+		return () => {
+			if (!isFalsyOrEmpty(result)) {
+				return undefined;
+			}
+			return asWinJsPromise(token => provider.provideDocumentRangeFormattingEdits(model, range, options, token)).then(value => {
+				result = value;
+			}, onUnexpectedExternalError);
+		};
 	})).then(() => result);
 }
 
@@ -59,14 +59,14 @@ export function getDocumentFormattingEdits(model: ITextModel, options: Formattin
 
 	let result: TextEdit[];
 	return sequence(providers.map(provider => {
-		if (isFalsyOrEmpty(result)) {
-			return () => {
-				return asWinJsPromise(token => provider.provideDocumentFormattingEdits(model, options, token)).then(value => {
-					result = value;
-				}, onUnexpectedExternalError);
-			};
-		}
-		return undefined;
+		return () => {
+			if (!isFalsyOrEmpty(result)) {
+				return undefined;
+			}
+			return asWinJsPromise(token => provider.provideDocumentFormattingEdits(model, options, token)).then(value => {
+				result = value;
+			}, onUnexpectedExternalError);
+		};
 	})).then(() => result);
 }
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
index daeba76fd08..d348ee87d64 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -1034,6 +1034,13 @@ suite('ExtHostLanguageFeatures', function () {
 	});
 
 	test('Format Doc, order', function () {
+
+		disposables.push(extHost.registerDocumentFormattingEditProvider(defaultSelector, <vscode.DocumentFormattingEditProvider>{
+			provideDocumentFormattingEdits(): any {
+				return undefined;
+			}
+		}));
+
 		disposables.push(extHost.registerDocumentFormattingEditProvider(defaultSelector, <vscode.DocumentFormattingEditProvider>{
 			provideDocumentFormattingEdits(): any {
 				return [new types.TextEdit(new types.Range(0, 0, 0, 0), 'testing')];
@@ -1079,6 +1086,11 @@ suite('ExtHostLanguageFeatures', function () {
 				return [new types.TextEdit(new types.Range(0, 0, 0, 0), 'range')];
 			}
 		}));
+		disposables.push(extHost.registerDocumentRangeFormattingEditProvider(defaultSelector, <vscode.DocumentRangeFormattingEditProvider>{
+			provideDocumentRangeFormattingEdits(): any {
+				return [new types.TextEdit(new types.Range(2, 3, 4, 5), 'range2')];
+			}
+		}));
 		disposables.push(extHost.registerDocumentFormattingEditProvider(defaultSelector, <vscode.DocumentFormattingEditProvider>{
 			provideDocumentFormattingEdits(): any {
 				return [new types.TextEdit(new types.Range(0, 0, 1, 1), 'doc')];
@@ -1088,7 +1100,11 @@ suite('ExtHostLanguageFeatures', function () {
 			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
-				assert.equal(first.text, 'range');
+				assert.equal(first.text, 'range2');
+				assert.equal(first.range.startLineNumber, 3);
+				assert.equal(first.range.startColumn, 4);
+				assert.equal(first.range.endLineNumber, 5);
+				assert.equal(first.range.endColumn, 6);
 			});
 		});
 	});

From d51a2466f48f8dc9d55126555b680672740b0dc6 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 5 Apr 2018 19:16:02 +0200
Subject: [PATCH 347/383] #31039 Reuse the settings editor in the active group

---
 .../preferences/browser/preferencesService.ts | 55 +++++++++++++------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index b40e98e924c..c9e793a29d6 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -172,13 +172,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	openSettings(): TPromise<IEditor> {
-		const resource = this.lastOpenedSettingsInput ? this.lastOpenedSettingsInput.master.getResource() : this.userSettingsResource;
+		const editorInput = this.getActiveSettingsEditorInput() || this.lastOpenedSettingsInput;
+		const resource = editorInput ? editorInput.master.getResource() : this.userSettingsResource;
 		const target = this.getConfigurationTargetFromSettingsResource(resource);
-		return this.doOpenSettings(target, resource);
+		return this.openOrSwitchSettings(target, resource);
 	}
 
 	openGlobalSettings(options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
-		return this.doOpenSettings(ConfigurationTarget.USER, this.userSettingsResource, options, position);
+		return this.openOrSwitchSettings(ConfigurationTarget.USER, this.userSettingsResource, options, position);
 	}
 
 	openWorkspaceSettings(options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
@@ -186,29 +187,19 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			this.notificationService.info(nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
 			return TPromise.as(null);
 		}
-		return this.doOpenSettings(ConfigurationTarget.WORKSPACE, this.workspaceSettingsResource, options, position);
+		return this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE, this.workspaceSettingsResource, options, position);
 	}
 
 	openFolderSettings(folder: URI, options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
-		return this.doOpenSettings(ConfigurationTarget.WORKSPACE_FOLDER, this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder), options, position);
+		return this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE_FOLDER, this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder), options, position);
 	}
 
 	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void> {
 		const activeEditor = this.editorService.getActiveEditor();
 		if (activeEditor && activeEditor.input instanceof PreferencesEditorInput) {
-			return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
-				.then(toInput => {
-					const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
-					return this.editorService.replaceEditors([{
-						toReplace: activeEditor.input,
-						replaceWith
-					}], activeEditor.position).then(() => {
-						this.lastOpenedSettingsInput = replaceWith;
-					});
-				});
+			return this.doSwitchSettings(target, resource, activeEditor.input, activeEditor.position).then(() => null);
 		} else {
-			this.doOpenSettings(target, resource);
-			return undefined;
+			return this.doOpenSettings(target, resource).then(() => null);
 		}
 	}
 
@@ -249,6 +240,16 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			});
 	}
 
+	private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
+		const activeGroup = this.editorGroupService.getStacksModel().activeGroup;
+		const positionToReplace = position !== void 0 ? position : activeGroup ? this.editorGroupService.getStacksModel().positionOfGroup(activeGroup) : EditorPosition.ONE;
+		const editorInput = this.getActiveSettingsEditorInput(positionToReplace);
+		if (editorInput && editorInput.master.getResource().fsPath !== resource.fsPath) {
+			return this.doSwitchSettings(configurationTarget, resource, editorInput, positionToReplace);
+		}
+		return this.doOpenSettings(configurationTarget, resource, options, position);
+	}
+
 	private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
 		const openDefaultSettings = !!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING);
 		return this.getOrCreateEditableSettingsEditorInput(configurationTarget, resource)
@@ -269,6 +270,26 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			});
 	}
 
+	private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, position?: EditorPosition): TPromise<IEditor> {
+		return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
+			.then(toInput => {
+				const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
+				return this.editorService.replaceEditors([{
+					toReplace: input,
+					replaceWith
+				}], position).then(editors => {
+					this.lastOpenedSettingsInput = replaceWith;
+					return editors[0];
+				});
+			});
+	}
+
+	private getActiveSettingsEditorInput(position?: EditorPosition): PreferencesEditorInput {
+		const stacksModel = this.editorGroupService.getStacksModel();
+		const group = position !== void 0 ? stacksModel.groupAt(position) : stacksModel.activeGroup;
+		return group && <PreferencesEditorInput>group.getEditors().filter(e => e instanceof PreferencesEditorInput)[0];
+	}
+
 	private getConfigurationTargetFromSettingsResource(resource: URI): ConfigurationTarget {
 		if (this.userSettingsResource.toString() === resource.toString()) {
 			return ConfigurationTarget.USER;

From 8b501bc0f4206f906ddaef8137383c88c94332b0 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 4 Apr 2018 15:23:36 -0700
Subject: [PATCH 348/383] Refocus webviews on reveal

Fixes #46392
---
 .../parts/webview/electron-browser/webviewService.ts          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
index e9bead7bb42..c7b97ad1d1d 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
@@ -103,9 +103,9 @@ export class WebviewService implements IWebviewService {
 		}
 
 		if (webview.position === column) {
-			this._editorService.openEditor(webview, { preserveFocus: true }, column);
+			this._editorService.openEditor(webview, { preserveFocus: false }, column);
 		} else {
-			this._editorGroupService.moveEditor(webview, webview.position, column, { preserveFocus: true });
+			this._editorGroupService.moveEditor(webview, webview.position, column, { preserveFocus: false });
 		}
 	}
 

From caee7a578993c43434b4e2df8cd25b76325ed5ce Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 4 Apr 2018 16:07:31 -0700
Subject: [PATCH 349/383] Working on progress indicator when loading webview

---
 .../api/electron-browser/mainThreadWebview.ts |  7 +--
 src/vs/workbench/api/node/extHost.protocol.ts |  2 +-
 src/vs/workbench/api/node/extHostWebview.ts   |  6 +--
 .../webview/electron-browser/webviewEditor.ts |  4 +-
 .../webview/electron-browser/webviewInput.ts  | 12 ++---
 .../electron-browser/webviewService.ts        | 47 +++++++++++--------
 6 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 323f9e9db0e..222f5e17289 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -129,8 +129,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		this._revivers.delete(viewType);
 	}
 
-	reviveWebview(webview: WebviewEditorInput) {
-		this._extensionService.activateByEvent(`onView:${webview.state.viewType}`).then(() => {
+	reviveWebview(webview: WebviewEditorInput): TPromise<void> {
+		return this._extensionService.activateByEvent(`onView:${webview.state.viewType}`).then(() => {
 			const handle = 'revival-' + MainThreadWebviews.revivalPool++;
 			this._webviews.set(handle, webview);
 
@@ -145,7 +145,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 				}
 			};
 
-			this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options);
+			return this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options)
+				.then(() => { });
 		});
 	}
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 2a53c50b8ec..4c37176f89b 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -366,7 +366,7 @@ export interface ExtHostWebviewsShape {
 	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void;
 	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void>;
 	$onDidChangePosition(handle: WebviewHandle, newPosition: EditorPosition): void;
-	$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): void;
+	$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): Thenable<boolean>;
 	$serializeWebview(webviewHandle: WebviewHandle): Thenable<any>;
 }
 
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 5e3a1b38126..2312e863a41 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -237,15 +237,15 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		state: any,
 		position: Position,
 		options: vscode.WebviewOptions
-	): void {
+	): TPromise<boolean> {
 		const serializer = this._serializers.get(viewType);
 		if (!serializer) {
-			return;
+			return TPromise.as(false);
 		}
 
 		const revivedWebview = new ExtHostWebview(webviewHandle, this._proxy, viewType, typeConverters.toViewColumn(position), options);
 		this._webviews.set(webviewHandle, revivedWebview);
-		serializer.deserializeWebview(revivedWebview, state);
+		return serializer.deserializeWebview(revivedWebview, state);
 	}
 
 	$serializeWebview(
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index bfc40a60fff..96b53745e4c 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -145,10 +145,10 @@ export class WebviewEditor extends BaseWebviewEditor {
 			this._webview = undefined;
 			this.webviewContent = undefined;
 		}
-
 		await super.setInput(input, options);
 
-		input.onBecameActive(this.position);
+		await input.resolve();
+		await input.onBecameActive(this.position);
 		this.updateWebview(input);
 	}
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
index 1bd9535aeaf..10d3d0be8b4 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
@@ -141,6 +141,11 @@ export class WebviewEditorInput extends EditorInput {
 	}
 
 	public resolve(refresh?: boolean): TPromise<IEditorModel, any> {
+		if (this.reviver && !this._revived) {
+			this._revived = true;
+			return this.reviver.reviveWebview(this).then(() => new EditorModel());
+		}
+
 		return TPromise.as(new EditorModel());
 	}
 
@@ -221,16 +226,11 @@ export class WebviewEditorInput extends EditorInput {
 		this._currentWebviewHtml = '';
 	}
 
-	public onBecameActive(position: Position) {
+	public onBecameActive(position: Position): void {
 		this._position = position;
 
 		if (this._events && this._events.onDidChangePosition) {
 			this._events.onDidChangePosition(position);
 		}
-
-		if (this.reviver && !this._revived) {
-			this._revived = true;
-			this.reviver.reviveWebview(this);
-		}
 	}
 }
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
index c7b97ad1d1d..93cce4adeaa 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
@@ -10,6 +10,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import * as vscode from 'vscode';
 import { WebviewEditorInput } from './webviewInput';
+import { TPromise } from 'vs/base/common/winjs.base';
 
 export const IWebviewService = createDecorator<IWebviewService>('webviewService');
 
@@ -55,7 +56,7 @@ export interface WebviewReviver {
 
 	reviveWebview(
 		webview: WebviewEditorInput
-	): void;
+	): TPromise<void>;
 }
 
 export interface WebviewEvents {
@@ -73,7 +74,7 @@ export class WebviewService implements IWebviewService {
 	_serviceBrand: any;
 
 	private readonly _revivers = new Map<string, WebviewReviver>();
-	private readonly _needingRevival = new Map<string, WebviewEditorInput[]>();
+	private _awaitingRevival: { input: WebviewEditorInput, resolve: (x: any) => void }[] = [];
 
 	constructor(
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
@@ -120,12 +121,16 @@ export class WebviewService implements IWebviewService {
 			canRevive: (webview) => {
 				return true;
 			},
-			reviveWebview: (webview) => {
-				if (!this._needingRevival.has(viewType)) {
-					this._needingRevival.set(viewType, []);
+			reviveWebview: async (webview: WebviewEditorInput): TPromise<void> => {
+				const didRevive = await this.tryRevive(webview);
+				if (didRevive) {
+					return;
 				}
-				this._needingRevival.get(viewType).push(webviewInput);
-				this.tryRevive(viewType);
+				// A reviver may not be registered yet. Put into queue and resolve promise when can can revive
+				let resolve: (value: void) => void;
+				const promise = new TPromise<void>(r => { resolve = r; });
+				this._awaitingRevival.push({ input: webview, resolve });
+				return promise;
 			}
 		});
 
@@ -141,7 +146,15 @@ export class WebviewService implements IWebviewService {
 		}
 
 		this._revivers.set(viewType, reviver);
-		this.tryRevive(viewType);
+
+		// Resolve any pending views
+
+		const toRevive = this._awaitingRevival.filter(x => x.input.viewType === viewType);
+		this._awaitingRevival = this._awaitingRevival.filter(x => x.input.viewType !== viewType);
+
+		for (const input of toRevive) {
+			reviver.reviveWebview(input.input).then(() => input.resolve(void 0));
+		}
 
 		return toDisposable(() => {
 			this._revivers.delete(viewType);
@@ -156,20 +169,14 @@ export class WebviewService implements IWebviewService {
 	}
 
 	tryRevive(
-		viewType: string
-	) {
-		const reviver = this._revivers.get(viewType);
+		webview: WebviewEditorInput
+	): boolean {
+		const reviver = this._revivers.get(webview.viewType);
 		if (!reviver) {
-			return;
+			return false;
 		}
 
-		const toRevive = this._needingRevival.get(viewType);
-		if (!toRevive) {
-			return;
-		}
-
-		for (const webview of toRevive) {
-			reviver.reviveWebview(webview);
-		}
+		reviver.reviveWebview(webview);
+		return true;
 	}
 }
\ No newline at end of file

From 9755b46bf64bff999428aa08d9b9b09f9b23f18d Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 4 Apr 2018 16:30:35 -0700
Subject: [PATCH 350/383] Fix double click markdown editor when in split view

#47188
---
 extensions/markdown-language-features/media/index.js       | 4 ++--
 extensions/markdown-language-features/preview-src/index.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/markdown-language-features/media/index.js b/extensions/markdown-language-features/media/index.js
index d1abff530f4..567245df45d 100644
--- a/extensions/markdown-language-features/media/index.js
+++ b/extensions/markdown-language-features/media/index.js
@@ -698,7 +698,7 @@ document.addEventListener('dblclick', event => {
     const offset = event.pageY;
     const line = scroll_sync_1.getEditorLineNumberForPageOffset(offset);
     if (typeof line === 'number' && !isNaN(line)) {
-        messaging_1.postMessage('didClick', { line });
+        messaging_1.postMessage('didClick', { line: Math.floor(line) });
     }
 });
 document.addEventListener('click', event => {
@@ -940,4 +940,4 @@ exports.getSettings = getSettings;
 /***/ })
 
 /******/ });
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./node_modules/lodash.throttle/index.js","webpack:///(webpack)/buildin/global.js","webpack:///./preview-src/activeLineMarker.ts","webpack:///./preview-src/events.ts","webpack:///./preview-src/index.ts","webpack:///./preview-src/messaging.ts","webpack:///./preview-src/scroll-sync.ts","webpack:///./preview-src/settings.ts"],"names":[],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA,yDAAiD,cAAc;AAC/D;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;;AAGA;AACA;;;;;;;;;;;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa,OAAO;AACpB;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,OAAO;AAClB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA,8CAA8C,kBAAkB;AAChE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA,mDAAmD,oBAAoB;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,oBAAoB;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QA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","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./preview-src/index.ts\");\n","/**\n * lodash (Custom Build) <https://lodash.com/>\n * Build: `lodash modularize exports=\"npm\" -o ./`\n * Copyright jQuery Foundation and other contributors <https://jquery.org/>\n * Released under MIT license <https://lodash.com/license>\n * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>\n * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors\n */\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/** Used as references for various `Number` constants. */\nvar NAN = 0 / 0;\n\n/** `Object#toString` result references. */\nvar symbolTag = '[object Symbol]';\n\n/** Used to match leading and trailing whitespace. */\nvar reTrim = /^\\s+|\\s+$/g;\n\n/** Used to detect bad signed hexadecimal string values. */\nvar reIsBadHex = /^[-+]0x[0-9a-f]+$/i;\n\n/** Used to detect binary string values. */\nvar reIsBinary = /^0b[01]+$/i;\n\n/** Used to detect octal string values. */\nvar reIsOctal = /^0o[0-7]+$/i;\n\n/** Built-in method references without a dependency on `root`. */\nvar freeParseInt = parseInt;\n\n/** Detect free variable `global` from Node.js. */\nvar freeGlobal = typeof global == 'object' && global && global.Object === Object && global;\n\n/** Detect free variable `self`. */\nvar freeSelf = typeof self == 'object' && self && self.Object === Object && self;\n\n/** Used as a reference to the global object. */\nvar root = freeGlobal || freeSelf || Function('return this')();\n\n/** Used for built-in method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the\n * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objectToString = objectProto.toString;\n\n/* Built-in method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max,\n    nativeMin = Math.min;\n\n/**\n * Gets the timestamp of the number of milliseconds that have elapsed since\n * the Unix epoch (1 January 1970 00:00:00 UTC).\n *\n * @static\n * @memberOf _\n * @since 2.4.0\n * @category Date\n * @returns {number} Returns the timestamp.\n * @example\n *\n * _.defer(function(stamp) {\n *   console.log(_.now() - stamp);\n * }, _.now());\n * // => Logs the number of milliseconds it took for the deferred invocation.\n */\nvar now = function() {\n  return root.Date.now();\n};\n\n/**\n * Creates a debounced function that delays invoking `func` until after `wait`\n * milliseconds have elapsed since the last time the debounced function was\n * invoked. The debounced function comes with a `cancel` method to cancel\n * delayed `func` invocations and a `flush` method to immediately invoke them.\n * Provide `options` to indicate whether `func` should be invoked on the\n * leading and/or trailing edge of the `wait` timeout. The `func` is invoked\n * with the last arguments provided to the debounced function. Subsequent\n * calls to the debounced function return the result of the last `func`\n * invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the debounced function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.debounce` and `_.throttle`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to debounce.\n * @param {number} [wait=0] The number of milliseconds to delay.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=false]\n *  Specify invoking on the leading edge of the timeout.\n * @param {number} [options.maxWait]\n *  The maximum time `func` is allowed to be delayed before it's invoked.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new debounced function.\n * @example\n *\n * // Avoid costly calculations while the window size is in flux.\n * jQuery(window).on('resize', _.debounce(calculateLayout, 150));\n *\n * // Invoke `sendMail` when clicked, debouncing subsequent calls.\n * jQuery(element).on('click', _.debounce(sendMail, 300, {\n *   'leading': true,\n *   'trailing': false\n * }));\n *\n * // Ensure `batchLog` is invoked once after 1 second of debounced calls.\n * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 });\n * var source = new EventSource('/stream');\n * jQuery(source).on('message', debounced);\n *\n * // Cancel the trailing debounced invocation.\n * jQuery(window).on('popstate', debounced.cancel);\n */\nfunction debounce(func, wait, options) {\n  var lastArgs,\n      lastThis,\n      maxWait,\n      result,\n      timerId,\n      lastCallTime,\n      lastInvokeTime = 0,\n      leading = false,\n      maxing = false,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  wait = toNumber(wait) || 0;\n  if (isObject(options)) {\n    leading = !!options.leading;\n    maxing = 'maxWait' in options;\n    maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n\n  function invokeFunc(time) {\n    var args = lastArgs,\n        thisArg = lastThis;\n\n    lastArgs = lastThis = undefined;\n    lastInvokeTime = time;\n    result = func.apply(thisArg, args);\n    return result;\n  }\n\n  function leadingEdge(time) {\n    // Reset any `maxWait` timer.\n    lastInvokeTime = time;\n    // Start the timer for the trailing edge.\n    timerId = setTimeout(timerExpired, wait);\n    // Invoke the leading edge.\n    return leading ? invokeFunc(time) : result;\n  }\n\n  function remainingWait(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime,\n        result = wait - timeSinceLastCall;\n\n    return maxing ? nativeMin(result, maxWait - timeSinceLastInvoke) : result;\n  }\n\n  function shouldInvoke(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime;\n\n    // Either this is the first call, activity has stopped and we're at the\n    // trailing edge, the system time has gone backwards and we're treating\n    // it as the trailing edge, or we've hit the `maxWait` limit.\n    return (lastCallTime === undefined || (timeSinceLastCall >= wait) ||\n      (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait));\n  }\n\n  function timerExpired() {\n    var time = now();\n    if (shouldInvoke(time)) {\n      return trailingEdge(time);\n    }\n    // Restart the timer.\n    timerId = setTimeout(timerExpired, remainingWait(time));\n  }\n\n  function trailingEdge(time) {\n    timerId = undefined;\n\n    // Only invoke if we have `lastArgs` which means `func` has been\n    // debounced at least once.\n    if (trailing && lastArgs) {\n      return invokeFunc(time);\n    }\n    lastArgs = lastThis = undefined;\n    return result;\n  }\n\n  function cancel() {\n    if (timerId !== undefined) {\n      clearTimeout(timerId);\n    }\n    lastInvokeTime = 0;\n    lastArgs = lastCallTime = lastThis = timerId = undefined;\n  }\n\n  function flush() {\n    return timerId === undefined ? result : trailingEdge(now());\n  }\n\n  function debounced() {\n    var time = now(),\n        isInvoking = shouldInvoke(time);\n\n    lastArgs = arguments;\n    lastThis = this;\n    lastCallTime = time;\n\n    if (isInvoking) {\n      if (timerId === undefined) {\n        return leadingEdge(lastCallTime);\n      }\n      if (maxing) {\n        // Handle invocations in a tight loop.\n        timerId = setTimeout(timerExpired, wait);\n        return invokeFunc(lastCallTime);\n      }\n    }\n    if (timerId === undefined) {\n      timerId = setTimeout(timerExpired, wait);\n    }\n    return result;\n  }\n  debounced.cancel = cancel;\n  debounced.flush = flush;\n  return debounced;\n}\n\n/**\n * Creates a throttled function that only invokes `func` at most once per\n * every `wait` milliseconds. The throttled function comes with a `cancel`\n * method to cancel delayed `func` invocations and a `flush` method to\n * immediately invoke them. Provide `options` to indicate whether `func`\n * should be invoked on the leading and/or trailing edge of the `wait`\n * timeout. The `func` is invoked with the last arguments provided to the\n * throttled function. Subsequent calls to the throttled function return the\n * result of the last `func` invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the throttled function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.throttle` and `_.debounce`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to throttle.\n * @param {number} [wait=0] The number of milliseconds to throttle invocations to.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=true]\n *  Specify invoking on the leading edge of the timeout.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new throttled function.\n * @example\n *\n * // Avoid excessively updating the position while scrolling.\n * jQuery(window).on('scroll', _.throttle(updatePosition, 100));\n *\n * // Invoke `renewToken` when the click event is fired, but not more than once every 5 minutes.\n * var throttled = _.throttle(renewToken, 300000, { 'trailing': false });\n * jQuery(element).on('click', throttled);\n *\n * // Cancel the trailing throttled invocation.\n * jQuery(window).on('popstate', throttled.cancel);\n */\nfunction throttle(func, wait, options) {\n  var leading = true,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  if (isObject(options)) {\n    leading = 'leading' in options ? !!options.leading : leading;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n  return debounce(func, wait, {\n    'leading': leading,\n    'maxWait': wait,\n    'trailing': trailing\n  });\n}\n\n/**\n * Checks if `value` is the\n * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)\n * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(_.noop);\n * // => true\n *\n * _.isObject(null);\n * // => false\n */\nfunction isObject(value) {\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\n/**\n * Checks if `value` is object-like. A value is object-like if it's not `null`\n * and has a `typeof` result of \"object\".\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n * @example\n *\n * _.isObjectLike({});\n * // => true\n *\n * _.isObjectLike([1, 2, 3]);\n * // => true\n *\n * _.isObjectLike(_.noop);\n * // => false\n *\n * _.isObjectLike(null);\n * // => false\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\n/**\n * Checks if `value` is classified as a `Symbol` primitive or object.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.\n * @example\n *\n * _.isSymbol(Symbol.iterator);\n * // => true\n *\n * _.isSymbol('abc');\n * // => false\n */\nfunction isSymbol(value) {\n  return typeof value == 'symbol' ||\n    (isObjectLike(value) && objectToString.call(value) == symbolTag);\n}\n\n/**\n * Converts `value` to a number.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to process.\n * @returns {number} Returns the number.\n * @example\n *\n * _.toNumber(3.2);\n * // => 3.2\n *\n * _.toNumber(Number.MIN_VALUE);\n * // => 5e-324\n *\n * _.toNumber(Infinity);\n * // => Infinity\n *\n * _.toNumber('3.2');\n * // => 3.2\n */\nfunction toNumber(value) {\n  if (typeof value == 'number') {\n    return value;\n  }\n  if (isSymbol(value)) {\n    return NAN;\n  }\n  if (isObject(value)) {\n    var other = typeof value.valueOf == 'function' ? value.valueOf() : value;\n    value = isObject(other) ? (other + '') : other;\n  }\n  if (typeof value != 'string') {\n    return value === 0 ? value : +value;\n  }\n  value = value.replace(reTrim, '');\n  var isBinary = reIsBinary.test(value);\n  return (isBinary || reIsOctal.test(value))\n    ? freeParseInt(value.slice(2), isBinary ? 2 : 8)\n    : (reIsBadHex.test(value) ? NAN : +value);\n}\n\nmodule.exports = throttle;\n","var g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1, eval)(\"this\");\r\n} catch (e) {\r\n\t// This works if the window reference is available\r\n\tif (typeof window === \"object\") g = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\nimport { getElementsForSourceLine } from './scroll-sync';\n\nexport class ActiveLineMarker {\n\tprivate _current: any;\n\n\tonDidChangeTextEditorSelection(line: number) {\n\t\tconst { previous } = getElementsForSourceLine(line);\n\t\tthis._update(previous && previous.element);\n\t}\n\n\t_update(before: HTMLElement | undefined) {\n\t\tthis._unmarkActiveElement(this._current);\n\t\tthis._markActiveElement(before);\n\t\tthis._current = before;\n\t}\n\n\t_unmarkActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className = element.className.replace(/\\bcode-active-line\\b/g, '');\n\t}\n\n\t_markActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className += ' code-active-line';\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport function onceDocumentLoaded(f: () => void) {\n\tif (document.readyState === 'loading' || document.readyState === 'uninitialized') {\n\t\tdocument.addEventListener('DOMContentLoaded', f);\n\t} else {\n\t\tf();\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\nimport { postCommand, postMessage } from './messaging';\nimport { onceDocumentLoaded } from './events';\nimport { getEditorLineNumberForPageOffset, scrollToRevealSourceLine } from './scroll-sync';\nimport { ActiveLineMarker } from './activeLineMarker';\nimport throttle = require('lodash.throttle');\n\nvar scrollDisabled = true;\nconst marker = new ActiveLineMarker();\nconst settings = getSettings();\n\nonceDocumentLoaded(() => {\n\tif (settings.scrollPreviewWithEditor) {\n\t\tsetTimeout(() => {\n\t\t\tconst initialLine = +settings.line;\n\t\t\tif (!isNaN(initialLine)) {\n\t\t\t\tscrollDisabled = true;\n\t\t\t\tscrollToRevealSourceLine(initialLine);\n\t\t\t}\n\t\t}, 0);\n\t}\n});\n\nconst onUpdateView = (() => {\n\tconst doScroll = throttle((line: number) => {\n\t\tscrollDisabled = true;\n\t\tscrollToRevealSourceLine(line);\n\t}, 50);\n\n\treturn (line: number, settings: any) => {\n\t\tif (!isNaN(line)) {\n\t\t\tsettings.line = line;\n\t\t\tdoScroll(line);\n\t\t}\n\t};\n})();\n\nwindow.addEventListener('resize', () => {\n\tscrollDisabled = true;\n}, true);\n\nwindow.addEventListener('message', event => {\n\tif (event.data.source !== settings.source) {\n\t\treturn;\n\t}\n\n\tswitch (event.data.type) {\n\t\tcase 'onDidChangeTextEditorSelection':\n\t\t\tmarker.onDidChangeTextEditorSelection(event.data.line);\n\t\t\tbreak;\n\n\t\tcase 'updateView':\n\t\t\tonUpdateView(event.data.line, settings);\n\t\t\tbreak;\n\t}\n}, false);\n\ndocument.addEventListener('dblclick', event => {\n\tif (!settings.doubleClickToSwitchToEditor) {\n\t\treturn;\n\t}\n\n\t// Ignore clicks on links\n\tfor (let node = event.target as HTMLElement; node; node = node.parentNode as HTMLElement) {\n\t\tif (node.tagName === 'A') {\n\t\t\treturn;\n\t\t}\n\t}\n\n\tconst offset = event.pageY;\n\tconst line = getEditorLineNumberForPageOffset(offset);\n\tif (typeof line === 'number' && !isNaN(line)) {\n\t\tpostMessage('didClick', { line });\n\t}\n});\n\ndocument.addEventListener('click', event => {\n\tif (!event) {\n\t\treturn;\n\t}\n\n\tlet node: any = event.target;\n\twhile (node) {\n\t\tif (node.tagName && node.tagName === 'A' && node.href) {\n\t\t\tif (node.getAttribute('href').startsWith('#')) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (node.href.startsWith('file://') || node.href.startsWith('vscode-resource:')) {\n\t\t\t\tconst [path, fragment] = node.href.replace(/^(file:\\/\\/|vscode-resource:)/i, '').split('#');\n\t\t\t\tpostCommand('_markdown.openDocumentLink', [{ path, fragment }]);\n\t\t\t\tevent.preventDefault();\n\t\t\t\tevent.stopPropagation();\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tnode = node.parentNode;\n\t}\n}, true);\n\nif (settings.scrollEditorWithPreview) {\n\twindow.addEventListener('scroll', throttle(() => {\n\t\tif (scrollDisabled) {\n\t\t\tscrollDisabled = false;\n\t\t} else {\n\t\t\tconst line = getEditorLineNumberForPageOffset(window.scrollY);\n\t\t\tif (typeof line === 'number' && !isNaN(line)) {\n\t\t\t\tpostMessage('revealLine', { line });\n\t\t\t}\n\t\t}\n\t}, 50));\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n/**\n * Post a message to the markdown extension\n */\nexport function postMessage(type: string, body: object) {\n\twindow.parent.postMessage({\n\t\ttype,\n\t\tsource: getSettings().source,\n\t\tbody\n\t}, '*');\n}\n\n/**\n * Post a command to be executed to the markdown extension\n */\nexport function postCommand(command: string, args: any[]) {\n\tpostMessage('command', { command, args });\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n\nfunction clamp(min: number, max: number, value: number) {\n\treturn Math.min(max, Math.max(min, value));\n}\n\nfunction clampLine(line: number) {\n\treturn clamp(0, getSettings().lineCount - 1, line);\n}\n\n\nexport interface CodeLineElement {\n\telement: HTMLElement;\n\tline: number;\n}\n\nconst getCodeLineElements = (() => {\n\tlet elements: CodeLineElement[];\n\treturn () => {\n\t\tif (!elements) {\n\t\t\telements = Array.prototype.map.call(\n\t\t\t\tdocument.getElementsByClassName('code-line'),\n\t\t\t\t(element: any) => {\n\t\t\t\t\tconst line = +element.getAttribute('data-line');\n\t\t\t\t\treturn { element, line };\n\t\t\t\t})\n\t\t\t\t.filter((x: any) => !isNaN(x.line));\n\t\t}\n\t\treturn elements;\n\t};\n})();\n\n/**\n * Find the html elements that map to a specific target line in the editor.\n *\n * If an exact match, returns a single element. If the line is between elements,\n * returns the element prior to and the element after the given line.\n */\nexport function getElementsForSourceLine(targetLine: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lineNumber = Math.floor(targetLine);\n\tconst lines = getCodeLineElements();\n\tlet previous = lines[0] || null;\n\tfor (const entry of lines) {\n\t\tif (entry.line === lineNumber) {\n\t\t\treturn { previous: entry, next: undefined };\n\t\t}\n\t\telse if (entry.line > lineNumber) {\n\t\t\treturn { previous, next: entry };\n\t\t}\n\t\tprevious = entry;\n\t}\n\treturn { previous };\n}\n\n/**\n * Find the html elements that are at a specific pixel offset on the page.\n */\nexport function getLineElementsAtPageOffset(offset: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lines = getCodeLineElements();\n\tconst position = offset - window.scrollY;\n\tlet lo = -1;\n\tlet hi = lines.length - 1;\n\twhile (lo + 1 < hi) {\n\t\tconst mid = Math.floor((lo + hi) / 2);\n\t\tconst bounds = lines[mid].element.getBoundingClientRect();\n\t\tif (bounds.top + bounds.height >= position) {\n\t\t\thi = mid;\n\t\t}\n\t\telse {\n\t\t\tlo = mid;\n\t\t}\n\t}\n\tconst hiElement = lines[hi];\n\tconst hiBounds = hiElement.element.getBoundingClientRect();\n\tif (hi >= 1 && hiBounds.top > position) {\n\t\tconst loElement = lines[lo];\n\t\treturn { previous: loElement, next: hiElement };\n\t}\n\treturn { previous: hiElement };\n}\n\n/**\n * Attempt to reveal the element for a source line in the editor.\n */\nexport function scrollToRevealSourceLine(line: number) {\n\tconst { previous, next } = getElementsForSourceLine(line);\n\tif (previous && getSettings().scrollPreviewWithEditor) {\n\t\tlet scrollTo = 0;\n\t\tconst rect = previous.element.getBoundingClientRect();\n\t\tconst previousTop = rect.top;\n\t\tif (next && next.line !== previous.line) {\n\t\t\t// Between two elements. Go to percentage offset between them.\n\t\t\tconst betweenProgress = (line - previous.line) / (next.line - previous.line);\n\t\t\tconst elementOffset = next.element.getBoundingClientRect().top - previousTop;\n\t\t\tscrollTo = previousTop + betweenProgress * elementOffset;\n\t\t}\n\t\telse {\n\t\t\tscrollTo = previousTop;\n\t\t}\n\t\twindow.scroll(0, Math.max(1, window.scrollY + scrollTo));\n\t}\n}\n\nexport function getEditorLineNumberForPageOffset(offset: number) {\n\tconst { previous, next } = getLineElementsAtPageOffset(offset);\n\tif (previous) {\n\t\tconst previousBounds = previous.element.getBoundingClientRect();\n\t\tconst offsetFromPrevious = (offset - window.scrollY - previousBounds.top);\n\t\tif (next) {\n\t\t\tconst progressBetweenElements = offsetFromPrevious / (next.element.getBoundingClientRect().top - previousBounds.top);\n\t\t\tconst line = previous.line + progressBetweenElements * (next.line - previous.line);\n\t\t\treturn clampLine(line);\n\t\t}\n\t\telse {\n\t\t\tconst progressWithinElement = offsetFromPrevious / (previousBounds.height);\n\t\t\tconst line = previous.line + progressWithinElement;\n\t\t\treturn clampLine(line);\n\t\t}\n\t}\n\treturn null;\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport interface PreviewSettings {\n\tsource: string;\n\tline: number;\n\tlineCount: number;\n\tscrollPreviewWithEditor?: boolean;\n\tscrollEditorWithPreview: boolean;\n\tdisableSecurityWarnings: boolean;\n\tdoubleClickToSwitchToEditor: boolean;\n}\n\nlet cachedSettings: PreviewSettings | undefined = undefined;\n\nexport function getSettings(): PreviewSettings {\n\tif (cachedSettings) {\n\t\treturn cachedSettings;\n\t}\n\n\tconst element = document.getElementById('vscode-markdown-preview-data');\n\tif (element) {\n\t\tconst data = element.getAttribute('data-settings');\n\t\tif (data) {\n\t\t\tcachedSettings = JSON.parse(data);\n\t\t\treturn cachedSettings!;\n\t\t}\n\t}\n\n\tthrow new Error('Could not load settings');\n}\n"],"sourceRoot":""}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./node_modules/lodash.throttle/index.js","webpack:///(webpack)/buildin/global.js","webpack:///./preview-src/activeLineMarker.ts","webpack:///./preview-src/events.ts","webpack:///./preview-src/index.ts","webpack:///./preview-src/messaging.ts","webpack:///./preview-src/scroll-sync.ts","webpack:///./preview-src/settings.ts"],"names":[],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA,yDAAiD,cAAc;AAC/D;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;;AAGA;AACA;;;;;;;;;;;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa,OAAO;AACpB;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,OAAO;AAClB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA,8CAA8C,kBAAkB;AAChE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA,mDAAmD,oBAAoB;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,oBAAoB;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,OAAO;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;;;;;;;;;;;;ACtbA;;AAEA;AACA;AACA;AACA,CAAC;;AAED;AACA;AACA;AACA,CAAC;AACD;AACA;AACA;;AAEA;AACA;AACA,4CAA4C;;AAE5C;;;;;;;;;;;;;;;ACnBA;;;gGAGgG;AAChG,+FAAyD;AAEzD;IAGC,8BAA8B,CAAC,IAAY;QAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,sCAAwB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,MAA+B;QACtC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,oBAAoB,CAAC,OAAgC;QACpD,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACd,MAAM,CAAC;QACR,CAAC;QACD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,kBAAkB,CAAC,OAAgC;QAClD,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACd,MAAM,CAAC;QACR,CAAC;QACD,OAAO,CAAC,SAAS,IAAI,mBAAmB,CAAC;IAC1C,CAAC;CACD;AA3BD,4CA2BC;;;;;;;;;;;;;;ACjCD;;;gGAGgG;;AAEhG,4BAAmC,CAAa;IAC/C,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC;QAClF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAAC,IAAI,CAAC,CAAC;QACP,CAAC,EAAE,CAAC;IACL,CAAC;AACF,CAAC;AAND,gDAMC;;;;;;;;;;;;;;ACXD;;;gGAGgG;;AAEhG,sFAAyC;AACzC,yFAAuD;AACvD,gFAA8C;AAC9C,+FAA2F;AAC3F,8GAAsD;AACtD,uGAA6C;AAE7C,IAAI,cAAc,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,GAAG,IAAI,mCAAgB,EAAE,CAAC;AACtC,MAAM,QAAQ,GAAG,sBAAW,EAAE,CAAC;AAE/B,2BAAkB,CAAC,GAAG,EAAE;IACvB,EAAE,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACtC,UAAU,CAAC,GAAG,EAAE;YACf,MAAM,WAAW,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzB,cAAc,GAAG,IAAI,CAAC;gBACtB,sCAAwB,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC;QACF,CAAC,EAAE,CAAC,CAAC,CAAC;IACP,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;IAC1B,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,IAAY,EAAE,EAAE;QAC1C,cAAc,GAAG,IAAI,CAAC;QACtB,sCAAwB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,CAAC,CAAC,IAAY,EAAE,QAAa,EAAE,EAAE;QACtC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtC,cAAc,GAAG,IAAI,CAAC;AACvB,CAAC,EAAE,IAAI,CAAC,CAAC;AAET,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;IAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC;IACR,CAAC;IAED,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzB,KAAK,gCAAgC;YACpC,MAAM,CAAC,8BAA8B,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,KAAK,CAAC;QAEP,KAAK,YAAY;YAChB,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACxC,KAAK,CAAC;IACR,CAAC;AACF,CAAC,EAAE,KAAK,CAAC,CAAC;AAEV,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE;IAC7C,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC;IACR,CAAC;IAED,yBAAyB;IACzB,GAAG,CAAC,CAAC,IAAI,IAAI,GAAG,KAAK,CAAC,MAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,UAAyB,EAAE,CAAC;QAC1F,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC;YAC1B,MAAM,CAAC;QACR,CAAC;IACF,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;IAC3B,MAAM,IAAI,GAAG,8CAAgC,CAAC,MAAM,CAAC,CAAC;IACtD,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,uBAAW,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;IAC1C,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACZ,MAAM,CAAC;IACR,CAAC;IAED,IAAI,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC;IAC7B,OAAO,IAAI,EAAE,CAAC;QACb,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvD,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/C,KAAK,CAAC;YACP,CAAC;YACD,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjF,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC5F,uBAAW,CAAC,4BAA4B,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAChE,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,KAAK,CAAC,eAAe,EAAE,CAAC;gBACxB,KAAK,CAAC;YACP,CAAC;YACD,KAAK,CAAC;QACP,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;AACF,CAAC,EAAE,IAAI,CAAC,CAAC;AAET,EAAE,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACtC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE;QAC/C,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACpB,cAAc,GAAG,KAAK,CAAC;QACxB,CAAC;QAAC,IAAI,CAAC,CAAC;YACP,MAAM,IAAI,GAAG,8CAAgC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9D,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9C,uBAAW,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;IACF,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACT,CAAC;;;;;;;;;;;;;;ACpHD;;;gGAGgG;;AAEhG,sFAAyC;AAEzC;;GAEG;AACH,qBAA4B,IAAY,EAAE,IAAY;IACrD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;QACzB,IAAI;QACJ,MAAM,EAAE,sBAAW,EAAE,CAAC,MAAM;QAC5B,IAAI;KACJ,EAAE,GAAG,CAAC,CAAC;AACT,CAAC;AAND,kCAMC;AAED;;GAEG;AACH,qBAA4B,OAAe,EAAE,IAAW;IACvD,WAAW,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC;AAFD,kCAEC;;;;;;;;;;;;;;ACvBD;;;gGAGgG;;AAEhG,sFAAyC;AAGzC,eAAe,GAAW,EAAE,GAAW,EAAE,KAAa;IACrD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,mBAAmB,IAAY;IAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAW,EAAE,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AACpD,CAAC;AAQD,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE;IACjC,IAAI,QAA2B,CAAC;IAChC,MAAM,CAAC,GAAG,EAAE;QACX,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACf,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAClC,QAAQ,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAC5C,CAAC,OAAY,EAAE,EAAE;gBAChB,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC1B,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,CAAC,QAAQ,CAAC;IACjB,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL;;;;;GAKG;AACH,kCAAyC,UAAkB;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAChC,GAAG,CAAC,CAAC,MAAM,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;QAC3B,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC;QACD,QAAQ,GAAG,KAAK,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;AACrB,CAAC;AAdD,4DAcC;AAED;;GAEG;AACH,qCAA4C,MAAc;IACzD,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACZ,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAC1D,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC;YAC5C,EAAE,GAAG,GAAG,CAAC;QACV,CAAC;QACD,IAAI,CAAC,CAAC;YACL,EAAE,GAAG,GAAG,CAAC;QACV,CAAC;IACF,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAC3D,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACjD,CAAC;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAtBD,kEAsBC;AAED;;GAEG;AACH,kCAAyC,IAAY;IACpD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAC1D,EAAE,CAAC,CAAC,QAAQ,IAAI,sBAAW,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACvD,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;QAC7B,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACzC,8DAA8D;YAC9D,MAAM,eAAe,GAAG,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7E,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,GAAG,WAAW,CAAC;YAC7E,QAAQ,GAAG,WAAW,GAAG,eAAe,GAAG,aAAa,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,CAAC;YACL,QAAQ,GAAG,WAAW,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC;IAC1D,CAAC;AACF,CAAC;AAjBD,4DAiBC;AAED,0CAAiD,MAAc;IAC9D,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAC/D,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACd,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAChE,MAAM,kBAAkB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAC1E,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACV,MAAM,uBAAuB,GAAG,kBAAkB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;YACrH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,uBAAuB,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnF,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,CAAC;YACL,MAAM,qBAAqB,GAAG,kBAAkB,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC3E,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,qBAAqB,CAAC;YACnD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACF,CAAC;IACD,MAAM,CAAC,IAAI,CAAC;AACb,CAAC;AAjBD,4EAiBC;;;;;;;;;;;;;;AC9HD;;;gGAGgG;;AAYhG,IAAI,cAAc,GAAgC,SAAS,CAAC;AAE5D;IACC,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC;IACvB,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,8BAA8B,CAAC,CAAC;IACxE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACb,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QACnD,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACV,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,cAAe,CAAC;QACxB,CAAC;IACF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC5C,CAAC;AAfD,kCAeC","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./preview-src/index.ts\");\n","/**\n * lodash (Custom Build) <https://lodash.com/>\n * Build: `lodash modularize exports=\"npm\" -o ./`\n * Copyright jQuery Foundation and other contributors <https://jquery.org/>\n * Released under MIT license <https://lodash.com/license>\n * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>\n * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors\n */\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/** Used as references for various `Number` constants. */\nvar NAN = 0 / 0;\n\n/** `Object#toString` result references. */\nvar symbolTag = '[object Symbol]';\n\n/** Used to match leading and trailing whitespace. */\nvar reTrim = /^\\s+|\\s+$/g;\n\n/** Used to detect bad signed hexadecimal string values. */\nvar reIsBadHex = /^[-+]0x[0-9a-f]+$/i;\n\n/** Used to detect binary string values. */\nvar reIsBinary = /^0b[01]+$/i;\n\n/** Used to detect octal string values. */\nvar reIsOctal = /^0o[0-7]+$/i;\n\n/** Built-in method references without a dependency on `root`. */\nvar freeParseInt = parseInt;\n\n/** Detect free variable `global` from Node.js. */\nvar freeGlobal = typeof global == 'object' && global && global.Object === Object && global;\n\n/** Detect free variable `self`. */\nvar freeSelf = typeof self == 'object' && self && self.Object === Object && self;\n\n/** Used as a reference to the global object. */\nvar root = freeGlobal || freeSelf || Function('return this')();\n\n/** Used for built-in method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the\n * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objectToString = objectProto.toString;\n\n/* Built-in method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max,\n    nativeMin = Math.min;\n\n/**\n * Gets the timestamp of the number of milliseconds that have elapsed since\n * the Unix epoch (1 January 1970 00:00:00 UTC).\n *\n * @static\n * @memberOf _\n * @since 2.4.0\n * @category Date\n * @returns {number} Returns the timestamp.\n * @example\n *\n * _.defer(function(stamp) {\n *   console.log(_.now() - stamp);\n * }, _.now());\n * // => Logs the number of milliseconds it took for the deferred invocation.\n */\nvar now = function() {\n  return root.Date.now();\n};\n\n/**\n * Creates a debounced function that delays invoking `func` until after `wait`\n * milliseconds have elapsed since the last time the debounced function was\n * invoked. The debounced function comes with a `cancel` method to cancel\n * delayed `func` invocations and a `flush` method to immediately invoke them.\n * Provide `options` to indicate whether `func` should be invoked on the\n * leading and/or trailing edge of the `wait` timeout. The `func` is invoked\n * with the last arguments provided to the debounced function. Subsequent\n * calls to the debounced function return the result of the last `func`\n * invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the debounced function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.debounce` and `_.throttle`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to debounce.\n * @param {number} [wait=0] The number of milliseconds to delay.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=false]\n *  Specify invoking on the leading edge of the timeout.\n * @param {number} [options.maxWait]\n *  The maximum time `func` is allowed to be delayed before it's invoked.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new debounced function.\n * @example\n *\n * // Avoid costly calculations while the window size is in flux.\n * jQuery(window).on('resize', _.debounce(calculateLayout, 150));\n *\n * // Invoke `sendMail` when clicked, debouncing subsequent calls.\n * jQuery(element).on('click', _.debounce(sendMail, 300, {\n *   'leading': true,\n *   'trailing': false\n * }));\n *\n * // Ensure `batchLog` is invoked once after 1 second of debounced calls.\n * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 });\n * var source = new EventSource('/stream');\n * jQuery(source).on('message', debounced);\n *\n * // Cancel the trailing debounced invocation.\n * jQuery(window).on('popstate', debounced.cancel);\n */\nfunction debounce(func, wait, options) {\n  var lastArgs,\n      lastThis,\n      maxWait,\n      result,\n      timerId,\n      lastCallTime,\n      lastInvokeTime = 0,\n      leading = false,\n      maxing = false,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  wait = toNumber(wait) || 0;\n  if (isObject(options)) {\n    leading = !!options.leading;\n    maxing = 'maxWait' in options;\n    maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n\n  function invokeFunc(time) {\n    var args = lastArgs,\n        thisArg = lastThis;\n\n    lastArgs = lastThis = undefined;\n    lastInvokeTime = time;\n    result = func.apply(thisArg, args);\n    return result;\n  }\n\n  function leadingEdge(time) {\n    // Reset any `maxWait` timer.\n    lastInvokeTime = time;\n    // Start the timer for the trailing edge.\n    timerId = setTimeout(timerExpired, wait);\n    // Invoke the leading edge.\n    return leading ? invokeFunc(time) : result;\n  }\n\n  function remainingWait(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime,\n        result = wait - timeSinceLastCall;\n\n    return maxing ? nativeMin(result, maxWait - timeSinceLastInvoke) : result;\n  }\n\n  function shouldInvoke(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime;\n\n    // Either this is the first call, activity has stopped and we're at the\n    // trailing edge, the system time has gone backwards and we're treating\n    // it as the trailing edge, or we've hit the `maxWait` limit.\n    return (lastCallTime === undefined || (timeSinceLastCall >= wait) ||\n      (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait));\n  }\n\n  function timerExpired() {\n    var time = now();\n    if (shouldInvoke(time)) {\n      return trailingEdge(time);\n    }\n    // Restart the timer.\n    timerId = setTimeout(timerExpired, remainingWait(time));\n  }\n\n  function trailingEdge(time) {\n    timerId = undefined;\n\n    // Only invoke if we have `lastArgs` which means `func` has been\n    // debounced at least once.\n    if (trailing && lastArgs) {\n      return invokeFunc(time);\n    }\n    lastArgs = lastThis = undefined;\n    return result;\n  }\n\n  function cancel() {\n    if (timerId !== undefined) {\n      clearTimeout(timerId);\n    }\n    lastInvokeTime = 0;\n    lastArgs = lastCallTime = lastThis = timerId = undefined;\n  }\n\n  function flush() {\n    return timerId === undefined ? result : trailingEdge(now());\n  }\n\n  function debounced() {\n    var time = now(),\n        isInvoking = shouldInvoke(time);\n\n    lastArgs = arguments;\n    lastThis = this;\n    lastCallTime = time;\n\n    if (isInvoking) {\n      if (timerId === undefined) {\n        return leadingEdge(lastCallTime);\n      }\n      if (maxing) {\n        // Handle invocations in a tight loop.\n        timerId = setTimeout(timerExpired, wait);\n        return invokeFunc(lastCallTime);\n      }\n    }\n    if (timerId === undefined) {\n      timerId = setTimeout(timerExpired, wait);\n    }\n    return result;\n  }\n  debounced.cancel = cancel;\n  debounced.flush = flush;\n  return debounced;\n}\n\n/**\n * Creates a throttled function that only invokes `func` at most once per\n * every `wait` milliseconds. The throttled function comes with a `cancel`\n * method to cancel delayed `func` invocations and a `flush` method to\n * immediately invoke them. Provide `options` to indicate whether `func`\n * should be invoked on the leading and/or trailing edge of the `wait`\n * timeout. The `func` is invoked with the last arguments provided to the\n * throttled function. Subsequent calls to the throttled function return the\n * result of the last `func` invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the throttled function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.throttle` and `_.debounce`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to throttle.\n * @param {number} [wait=0] The number of milliseconds to throttle invocations to.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=true]\n *  Specify invoking on the leading edge of the timeout.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new throttled function.\n * @example\n *\n * // Avoid excessively updating the position while scrolling.\n * jQuery(window).on('scroll', _.throttle(updatePosition, 100));\n *\n * // Invoke `renewToken` when the click event is fired, but not more than once every 5 minutes.\n * var throttled = _.throttle(renewToken, 300000, { 'trailing': false });\n * jQuery(element).on('click', throttled);\n *\n * // Cancel the trailing throttled invocation.\n * jQuery(window).on('popstate', throttled.cancel);\n */\nfunction throttle(func, wait, options) {\n  var leading = true,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  if (isObject(options)) {\n    leading = 'leading' in options ? !!options.leading : leading;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n  return debounce(func, wait, {\n    'leading': leading,\n    'maxWait': wait,\n    'trailing': trailing\n  });\n}\n\n/**\n * Checks if `value` is the\n * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)\n * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(_.noop);\n * // => true\n *\n * _.isObject(null);\n * // => false\n */\nfunction isObject(value) {\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\n/**\n * Checks if `value` is object-like. A value is object-like if it's not `null`\n * and has a `typeof` result of \"object\".\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n * @example\n *\n * _.isObjectLike({});\n * // => true\n *\n * _.isObjectLike([1, 2, 3]);\n * // => true\n *\n * _.isObjectLike(_.noop);\n * // => false\n *\n * _.isObjectLike(null);\n * // => false\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\n/**\n * Checks if `value` is classified as a `Symbol` primitive or object.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.\n * @example\n *\n * _.isSymbol(Symbol.iterator);\n * // => true\n *\n * _.isSymbol('abc');\n * // => false\n */\nfunction isSymbol(value) {\n  return typeof value == 'symbol' ||\n    (isObjectLike(value) && objectToString.call(value) == symbolTag);\n}\n\n/**\n * Converts `value` to a number.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to process.\n * @returns {number} Returns the number.\n * @example\n *\n * _.toNumber(3.2);\n * // => 3.2\n *\n * _.toNumber(Number.MIN_VALUE);\n * // => 5e-324\n *\n * _.toNumber(Infinity);\n * // => Infinity\n *\n * _.toNumber('3.2');\n * // => 3.2\n */\nfunction toNumber(value) {\n  if (typeof value == 'number') {\n    return value;\n  }\n  if (isSymbol(value)) {\n    return NAN;\n  }\n  if (isObject(value)) {\n    var other = typeof value.valueOf == 'function' ? value.valueOf() : value;\n    value = isObject(other) ? (other + '') : other;\n  }\n  if (typeof value != 'string') {\n    return value === 0 ? value : +value;\n  }\n  value = value.replace(reTrim, '');\n  var isBinary = reIsBinary.test(value);\n  return (isBinary || reIsOctal.test(value))\n    ? freeParseInt(value.slice(2), isBinary ? 2 : 8)\n    : (reIsBadHex.test(value) ? NAN : +value);\n}\n\nmodule.exports = throttle;\n","var g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1, eval)(\"this\");\r\n} catch (e) {\r\n\t// This works if the window reference is available\r\n\tif (typeof window === \"object\") g = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\nimport { getElementsForSourceLine } from './scroll-sync';\n\nexport class ActiveLineMarker {\n\tprivate _current: any;\n\n\tonDidChangeTextEditorSelection(line: number) {\n\t\tconst { previous } = getElementsForSourceLine(line);\n\t\tthis._update(previous && previous.element);\n\t}\n\n\t_update(before: HTMLElement | undefined) {\n\t\tthis._unmarkActiveElement(this._current);\n\t\tthis._markActiveElement(before);\n\t\tthis._current = before;\n\t}\n\n\t_unmarkActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className = element.className.replace(/\\bcode-active-line\\b/g, '');\n\t}\n\n\t_markActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className += ' code-active-line';\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport function onceDocumentLoaded(f: () => void) {\n\tif (document.readyState === 'loading' || document.readyState === 'uninitialized') {\n\t\tdocument.addEventListener('DOMContentLoaded', f);\n\t} else {\n\t\tf();\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\nimport { postCommand, postMessage } from './messaging';\nimport { onceDocumentLoaded } from './events';\nimport { getEditorLineNumberForPageOffset, scrollToRevealSourceLine } from './scroll-sync';\nimport { ActiveLineMarker } from './activeLineMarker';\nimport throttle = require('lodash.throttle');\n\nvar scrollDisabled = true;\nconst marker = new ActiveLineMarker();\nconst settings = getSettings();\n\nonceDocumentLoaded(() => {\n\tif (settings.scrollPreviewWithEditor) {\n\t\tsetTimeout(() => {\n\t\t\tconst initialLine = +settings.line;\n\t\t\tif (!isNaN(initialLine)) {\n\t\t\t\tscrollDisabled = true;\n\t\t\t\tscrollToRevealSourceLine(initialLine);\n\t\t\t}\n\t\t}, 0);\n\t}\n});\n\nconst onUpdateView = (() => {\n\tconst doScroll = throttle((line: number) => {\n\t\tscrollDisabled = true;\n\t\tscrollToRevealSourceLine(line);\n\t}, 50);\n\n\treturn (line: number, settings: any) => {\n\t\tif (!isNaN(line)) {\n\t\t\tsettings.line = line;\n\t\t\tdoScroll(line);\n\t\t}\n\t};\n})();\n\nwindow.addEventListener('resize', () => {\n\tscrollDisabled = true;\n}, true);\n\nwindow.addEventListener('message', event => {\n\tif (event.data.source !== settings.source) {\n\t\treturn;\n\t}\n\n\tswitch (event.data.type) {\n\t\tcase 'onDidChangeTextEditorSelection':\n\t\t\tmarker.onDidChangeTextEditorSelection(event.data.line);\n\t\t\tbreak;\n\n\t\tcase 'updateView':\n\t\t\tonUpdateView(event.data.line, settings);\n\t\t\tbreak;\n\t}\n}, false);\n\ndocument.addEventListener('dblclick', event => {\n\tif (!settings.doubleClickToSwitchToEditor) {\n\t\treturn;\n\t}\n\n\t// Ignore clicks on links\n\tfor (let node = event.target as HTMLElement; node; node = node.parentNode as HTMLElement) {\n\t\tif (node.tagName === 'A') {\n\t\t\treturn;\n\t\t}\n\t}\n\n\tconst offset = event.pageY;\n\tconst line = getEditorLineNumberForPageOffset(offset);\n\tif (typeof line === 'number' && !isNaN(line)) {\n\t\tpostMessage('didClick', { line: Math.floor(line) });\n\t}\n});\n\ndocument.addEventListener('click', event => {\n\tif (!event) {\n\t\treturn;\n\t}\n\n\tlet node: any = event.target;\n\twhile (node) {\n\t\tif (node.tagName && node.tagName === 'A' && node.href) {\n\t\t\tif (node.getAttribute('href').startsWith('#')) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (node.href.startsWith('file://') || node.href.startsWith('vscode-resource:')) {\n\t\t\t\tconst [path, fragment] = node.href.replace(/^(file:\\/\\/|vscode-resource:)/i, '').split('#');\n\t\t\t\tpostCommand('_markdown.openDocumentLink', [{ path, fragment }]);\n\t\t\t\tevent.preventDefault();\n\t\t\t\tevent.stopPropagation();\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tnode = node.parentNode;\n\t}\n}, true);\n\nif (settings.scrollEditorWithPreview) {\n\twindow.addEventListener('scroll', throttle(() => {\n\t\tif (scrollDisabled) {\n\t\t\tscrollDisabled = false;\n\t\t} else {\n\t\t\tconst line = getEditorLineNumberForPageOffset(window.scrollY);\n\t\t\tif (typeof line === 'number' && !isNaN(line)) {\n\t\t\t\tpostMessage('revealLine', { line });\n\t\t\t}\n\t\t}\n\t}, 50));\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n/**\n * Post a message to the markdown extension\n */\nexport function postMessage(type: string, body: object) {\n\twindow.parent.postMessage({\n\t\ttype,\n\t\tsource: getSettings().source,\n\t\tbody\n\t}, '*');\n}\n\n/**\n * Post a command to be executed to the markdown extension\n */\nexport function postCommand(command: string, args: any[]) {\n\tpostMessage('command', { command, args });\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n\nfunction clamp(min: number, max: number, value: number) {\n\treturn Math.min(max, Math.max(min, value));\n}\n\nfunction clampLine(line: number) {\n\treturn clamp(0, getSettings().lineCount - 1, line);\n}\n\n\nexport interface CodeLineElement {\n\telement: HTMLElement;\n\tline: number;\n}\n\nconst getCodeLineElements = (() => {\n\tlet elements: CodeLineElement[];\n\treturn () => {\n\t\tif (!elements) {\n\t\t\telements = Array.prototype.map.call(\n\t\t\t\tdocument.getElementsByClassName('code-line'),\n\t\t\t\t(element: any) => {\n\t\t\t\t\tconst line = +element.getAttribute('data-line');\n\t\t\t\t\treturn { element, line };\n\t\t\t\t})\n\t\t\t\t.filter((x: any) => !isNaN(x.line));\n\t\t}\n\t\treturn elements;\n\t};\n})();\n\n/**\n * Find the html elements that map to a specific target line in the editor.\n *\n * If an exact match, returns a single element. If the line is between elements,\n * returns the element prior to and the element after the given line.\n */\nexport function getElementsForSourceLine(targetLine: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lineNumber = Math.floor(targetLine);\n\tconst lines = getCodeLineElements();\n\tlet previous = lines[0] || null;\n\tfor (const entry of lines) {\n\t\tif (entry.line === lineNumber) {\n\t\t\treturn { previous: entry, next: undefined };\n\t\t}\n\t\telse if (entry.line > lineNumber) {\n\t\t\treturn { previous, next: entry };\n\t\t}\n\t\tprevious = entry;\n\t}\n\treturn { previous };\n}\n\n/**\n * Find the html elements that are at a specific pixel offset on the page.\n */\nexport function getLineElementsAtPageOffset(offset: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lines = getCodeLineElements();\n\tconst position = offset - window.scrollY;\n\tlet lo = -1;\n\tlet hi = lines.length - 1;\n\twhile (lo + 1 < hi) {\n\t\tconst mid = Math.floor((lo + hi) / 2);\n\t\tconst bounds = lines[mid].element.getBoundingClientRect();\n\t\tif (bounds.top + bounds.height >= position) {\n\t\t\thi = mid;\n\t\t}\n\t\telse {\n\t\t\tlo = mid;\n\t\t}\n\t}\n\tconst hiElement = lines[hi];\n\tconst hiBounds = hiElement.element.getBoundingClientRect();\n\tif (hi >= 1 && hiBounds.top > position) {\n\t\tconst loElement = lines[lo];\n\t\treturn { previous: loElement, next: hiElement };\n\t}\n\treturn { previous: hiElement };\n}\n\n/**\n * Attempt to reveal the element for a source line in the editor.\n */\nexport function scrollToRevealSourceLine(line: number) {\n\tconst { previous, next } = getElementsForSourceLine(line);\n\tif (previous && getSettings().scrollPreviewWithEditor) {\n\t\tlet scrollTo = 0;\n\t\tconst rect = previous.element.getBoundingClientRect();\n\t\tconst previousTop = rect.top;\n\t\tif (next && next.line !== previous.line) {\n\t\t\t// Between two elements. Go to percentage offset between them.\n\t\t\tconst betweenProgress = (line - previous.line) / (next.line - previous.line);\n\t\t\tconst elementOffset = next.element.getBoundingClientRect().top - previousTop;\n\t\t\tscrollTo = previousTop + betweenProgress * elementOffset;\n\t\t}\n\t\telse {\n\t\t\tscrollTo = previousTop;\n\t\t}\n\t\twindow.scroll(0, Math.max(1, window.scrollY + scrollTo));\n\t}\n}\n\nexport function getEditorLineNumberForPageOffset(offset: number) {\n\tconst { previous, next } = getLineElementsAtPageOffset(offset);\n\tif (previous) {\n\t\tconst previousBounds = previous.element.getBoundingClientRect();\n\t\tconst offsetFromPrevious = (offset - window.scrollY - previousBounds.top);\n\t\tif (next) {\n\t\t\tconst progressBetweenElements = offsetFromPrevious / (next.element.getBoundingClientRect().top - previousBounds.top);\n\t\t\tconst line = previous.line + progressBetweenElements * (next.line - previous.line);\n\t\t\treturn clampLine(line);\n\t\t}\n\t\telse {\n\t\t\tconst progressWithinElement = offsetFromPrevious / (previousBounds.height);\n\t\t\tconst line = previous.line + progressWithinElement;\n\t\t\treturn clampLine(line);\n\t\t}\n\t}\n\treturn null;\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport interface PreviewSettings {\n\tsource: string;\n\tline: number;\n\tlineCount: number;\n\tscrollPreviewWithEditor?: boolean;\n\tscrollEditorWithPreview: boolean;\n\tdisableSecurityWarnings: boolean;\n\tdoubleClickToSwitchToEditor: boolean;\n}\n\nlet cachedSettings: PreviewSettings | undefined = undefined;\n\nexport function getSettings(): PreviewSettings {\n\tif (cachedSettings) {\n\t\treturn cachedSettings;\n\t}\n\n\tconst element = document.getElementById('vscode-markdown-preview-data');\n\tif (element) {\n\t\tconst data = element.getAttribute('data-settings');\n\t\tif (data) {\n\t\t\tcachedSettings = JSON.parse(data);\n\t\t\treturn cachedSettings!;\n\t\t}\n\t}\n\n\tthrow new Error('Could not load settings');\n}\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 85d3f87fed8..5bce7230b85 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -75,7 +75,7 @@ document.addEventListener('dblclick', event => {
 	const offset = event.pageY;
 	const line = getEditorLineNumberForPageOffset(offset);
 	if (typeof line === 'number' && !isNaN(line)) {
-		postMessage('didClick', { line });
+		postMessage('didClick', { line: Math.floor(line) });
 	}
 });
 

From d0f7d2e8da90c67d8b7d5dbfa415880a8057aef8 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 10:23:23 -0700
Subject: [PATCH 351/383] Fix compile error

---
 src/vs/workbench/api/node/extHostWebview.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 2312e863a41..3a316bb6baf 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -237,7 +237,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		state: any,
 		position: Position,
 		options: vscode.WebviewOptions
-	): TPromise<boolean> {
+	): Thenable<boolean> {
 		const serializer = this._serializers.get(viewType);
 		if (!serializer) {
 			return TPromise.as(false);

From afc08ae477293c178d0c563b21a3bfe99f068f56 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 10:24:07 -0700
Subject: [PATCH 352/383] Make markdown preview revive wait on content
 populated

---
 .../src/features/preview.ts                     | 17 ++++++++---------
 .../src/features/previewManager.ts              |  3 +--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
index 5a3ca7443d4..8a357a2ff68 100644
--- a/extensions/markdown-language-features/src/features/preview.ts
+++ b/extensions/markdown-language-features/src/features/preview.ts
@@ -29,14 +29,14 @@ export class MarkdownPreview {
 	private forceUpdate = false;
 	private isScrolling = false;
 
-	public static revive(
+	public static async revive(
 		webview: vscode.Webview,
 		state: any,
 		contentProvider: MarkdownContentProvider,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
 		logger: Logger,
 		topmostLineMonitor: MarkdownFileTopmostLineMonitor
-	): MarkdownPreview {
+	): Promise<MarkdownPreview> {
 		const resource = vscode.Uri.parse(state.resource);
 		const locked = state.locked;
 		const line = state.line;
@@ -53,6 +53,7 @@ export class MarkdownPreview {
 		if (!isNaN(line)) {
 			preview.line = line;
 		}
+		await preview.doUpdate();
 		return preview;
 	}
 
@@ -299,13 +300,11 @@ export class MarkdownPreview {
 		this.forceUpdate = false;
 
 		this.currentVersion = { resource, version: document.version };
-		this.contentProvider.provideTextDocumentContent(document, this.previewConfigurations, this.line)
-			.then(content => {
-				if (this._resource === resource) {
-					this.webview.title = MarkdownPreview.getPreviewTitle(this._resource, this.locked);
-					this.webview.html = content;
-				}
-			});
+		const content = await this.contentProvider.provideTextDocumentContent(document, this.previewConfigurations, this.line);
+		if (this._resource === resource) {
+			this.webview.title = MarkdownPreview.getPreviewTitle(this._resource, this.locked);
+			this.webview.html = content;
+		}
 	}
 
 	private static getLocalResourceRoots(
diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts
index d9a2752edd3..7186ea4e4bb 100644
--- a/extensions/markdown-language-features/src/features/previewManager.ts
+++ b/extensions/markdown-language-features/src/features/previewManager.ts
@@ -92,7 +92,7 @@ export class MarkdownPreviewManager implements vscode.WebviewSerializer {
 		webview: vscode.Webview,
 		state: any
 	): Promise<boolean> {
-		const preview = MarkdownPreview.revive(
+		const preview = await MarkdownPreview.revive(
 			webview,
 			state,
 			this.contentProvider,
@@ -101,7 +101,6 @@ export class MarkdownPreviewManager implements vscode.WebviewSerializer {
 			this.topmostLineMonitor);
 
 		this.registerPreview(preview);
-		preview.refresh();
 		return true;
 	}
 

From 043538eeb07fc8854d97d3abaed378b28240b804 Mon Sep 17 00:00:00 2001
From: Christopher Leidigh <cleidigh@Gmail.com>
Date: Thu, 5 Apr 2018 15:11:19 -0400
Subject: [PATCH 353/383] SelectBox: Add bounds checking on selected option. 
 Addresses: #43475, #44309 (#47044)

---
 .../browser/ui/selectBox/selectBoxCustom.ts    | 18 +++++++++++++++++-
 .../browser/ui/selectBox/selectBoxNative.ts    | 12 +++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index 286bfeb835f..3e11ab520f9 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -229,7 +229,17 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		}
 
 		if (selected !== undefined) {
-			this.select(selected);
+			// Guard against out of bounds selected values
+			// Cannot currently return error, set selected within range
+			if (selected >= 0 && selected < this.options.length) {
+				this.select(selected);
+			} else if (selected > this.options.length - 1) {
+				// This could make client out of sync with the select
+				this.select(this.options.length - 1);
+				console.error('selectBoxCustom: setOptions selected exceeds options length');
+			} else if (selected < 0) {
+				this.selected = 0;
+			}
 		}
 	}
 
@@ -353,6 +363,12 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 			return;
 		}
 
+		// Bounds check selected/list before attempting to show
+		if (this.selected < 0 || this.selected > this.options.length - 1 || !this.selectList.length) {
+			console.error('selectBoxCustom: showSelectDropDown this.select exceeds options length or empty list');
+			return;
+		}
+
 		this._isVisible = true;
 		this.cloneElementFont(this.selectElement, this.selectDropDownContainer);
 		this.contextViewProvider.showContextView({
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
index 2f8f0184182..a04587b8685 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
@@ -84,7 +84,17 @@ export class SelectBoxNative implements ISelectBoxDelegate {
 		}
 
 		if (selected !== undefined) {
-			this.select(selected);
+			// Guard against out of bounds selected values
+			// Cannot currently return error, set selected within range
+			if (selected >= 0 && selected < this.options.length) {
+				this.select(selected);
+			} else if (selected > this.options.length - 1) {
+				// This could make client out of sync with the select
+				this.select(this.options.length - 1);
+				console.error('selectBoxNative: setOptions selected exceeds options length');
+			} else if (selected < 0) {
+				this.selected = 0;
+			}
 		}
 	}
 

From 0fec67c293c8215667c8f270355b533580155adc Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 10:36:05 -0700
Subject: [PATCH 354/383] Use clearer name

---
 .../parts/webview/electron-browser/webviewInputFactory.ts   | 2 +-
 .../parts/webview/electron-browser/webviewService.ts        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
index 824907dca95..648d36f2dc1 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
@@ -49,6 +49,6 @@ export class WebviewInputFactory implements IEditorInputFactory {
 		serializedEditorInput: string
 	): WebviewEditorInput {
 		const data: SerializedWebview = JSON.parse(serializedEditorInput);
-		return this._webviewService.createRevivableWebview(data.viewType, data.title, data.state, data.options, data.extensionFolderPath);
+		return this._webviewService.reviveWebview(data.viewType, data.title, data.state, data.options, data.extensionFolderPath);
 	}
 }
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
index 93cce4adeaa..6a04dfb4027 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
@@ -26,7 +26,7 @@ export interface IWebviewService {
 		events: WebviewEvents
 	): WebviewEditorInput;
 
-	createRevivableWebview(
+	reviveWebview(
 		viewType: string,
 		title: string,
 		state: any,
@@ -110,7 +110,7 @@ export class WebviewService implements IWebviewService {
 		}
 	}
 
-	createRevivableWebview(
+	reviveWebview(
 		viewType: string,
 		title: string,
 		state: any,
@@ -126,7 +126,7 @@ export class WebviewService implements IWebviewService {
 				if (didRevive) {
 					return;
 				}
-				// A reviver may not be registered yet. Put into queue and resolve promise when can can revive
+				// A reviver may not be registered yet. Put into queue and resolve promise when we can revive
 				let resolve: (value: void) => void;
 				const promise = new TPromise<void>(r => { resolve = r; });
 				this._awaitingRevival.push({ input: webview, resolve });

From 392979d217dca43e833a1f86720740bbc3fbfd5f Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 13:32:20 -0700
Subject: [PATCH 355/383] Fixes wrong release notes version showing on update

Fixes #47256
---
 src/vs/workbench/parts/update/electron-browser/update.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 9073b1d8d01..07ce8b15539 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -121,7 +121,7 @@ export class ProductContribution implements IWorkbenchContribution {
 
 		// was there an update? if so, open release notes
 		if (!environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
-			showReleaseNotes(instantiationService, lastVersion)
+			showReleaseNotes(instantiationService, pkg.version)
 				.then(undefined, () => {
 					notificationService.prompt(
 						severity.Info,

From 52b59d5e9a60b5e73f7296d96f6e5905e9338b82 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 14:31:35 -0700
Subject: [PATCH 356/383] Timebox webview serialization

---
 .../api/electron-browser/mainThreadWebview.ts     | 15 +++++++++++----
 .../electron-browser/webviewInputFactory.ts       |  5 +++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 222f5e17289..60eaaf1be9f 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -22,6 +22,8 @@ import { extHostNamedCustomer } from './extHostCustomers';
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
 export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviver {
 
+	private static readonly serializeTimeout = 500; // ms
+
 	private static readonly viewType = 'mainThreadWebview';
 
 	private static readonly standardSupportedLinkSchemes = ['http', 'https', 'mailto'];
@@ -163,14 +165,19 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		});
 
 		const reviveResponses = toRevive.map(handle =>
-			this._proxy.$serializeWebview(handle).then(state => ({ handle, state })));
+			TPromise.any([
+				this._proxy.$serializeWebview(handle).then(state => ({ handle, state })),
+				TPromise.timeout(MainThreadWebviews.serializeTimeout).then(() => ({ handle, state: null }))
+			]).then(x => x.value));
 
 		return TPromise.join(reviveResponses).then(results => {
 			for (const result of results) {
-				if (result.state) {
-					const view = this._webviews.get(result.handle);
-					if (view) {
+				const view = this._webviews.get(result.handle);
+				if (view) {
+					if (result.state) {
 						view.state.state = result.state;
+					} else {
+						view.state = null;
 					}
 				}
 			}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
index 648d36f2dc1..a6f4edb387f 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
@@ -29,6 +29,11 @@ export class WebviewInputFactory implements IEditorInputFactory {
 	public serialize(
 		input: WebviewEditorInput
 	): string {
+		// Has not state, don't revive
+		if (!input.state) {
+			return null;
+		}
+
 		// Only attempt revival if we may have a reviver
 		if (!this._webviewService.canRevive(input) && !input.reviver) {
 			return null;

From bae8e6922093b205b3ab1ab223c5a46881a5fc5f Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 18:33:43 -0700
Subject: [PATCH 357/383] WebviewService -> WebviewEditorService

---
 .../workbench/api/electron-browser/mainThreadWebview.ts   | 4 ++--
 .../parts/update/electron-browser/releaseNotesEditor.ts   | 8 ++++----
 .../webview/electron-browser/webview.contribution.ts      | 4 ++--
 .../{webviewService.ts => webviewEditorService.ts}        | 6 +++---
 .../parts/webview/electron-browser/webviewInput.ts        | 2 +-
 .../parts/webview/electron-browser/webviewInputFactory.ts | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename src/vs/workbench/parts/webview/electron-browser/{webviewService.ts => webviewEditorService.ts} (96%)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 60eaaf1be9f..71e7a3166fe 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -13,7 +13,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewHandle } from 'vs/workbench/api/node/extHost.protocol';
 import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor';
 import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
-import { IWebviewService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewService';
+import { IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
@@ -44,7 +44,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		@IEditorGroupService editorGroupService: IEditorGroupService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
-		@IWebviewService private readonly _webviewService: IWebviewService,
+		@IWebviewService private readonly _webviewService: IWebviewEditorService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index 12978917cf6..cb6672257ae 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -23,7 +23,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IRequestService } from 'vs/platform/request/node/request';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
-import { IWebviewService } from 'vs/workbench/parts/webview/electron-browser/webviewService';
+import { IWebviewEditorService } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { Position } from 'vs/platform/editor/common/editor';
@@ -61,7 +61,7 @@ export class ReleaseNotesManager {
 		@IRequestService private readonly _requestService: IRequestService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
-		@IWebviewService private readonly _webviewService: IWebviewService,
+		@IWebviewEditorService private readonly _webviewEditorService: IWebviewEditorService,
 	) { }
 
 	public async show(
@@ -76,9 +76,9 @@ export class ReleaseNotesManager {
 		if (this._currentReleaseNotes) {
 			this._currentReleaseNotes.setName(title);
 			this._currentReleaseNotes.html = html;
-			this._webviewService.revealWebview(this._currentReleaseNotes, activeEditor ? activeEditor.position : undefined);
+			this._webviewEditorService.revealWebview(this._currentReleaseNotes, activeEditor ? activeEditor.position : undefined);
 		} else {
-			this._currentReleaseNotes = this._webviewService.createWebview(
+			this._currentReleaseNotes = this._webviewEditorService.createWebview(
 				'releaseNotes',
 				title,
 				activeEditor ? activeEditor.position : Position.ONE,
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
index 2b98fd80e6d..cefbd347ca2 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
@@ -11,7 +11,7 @@ import { WebviewEditorInput } from './webviewInput';
 import { localize } from 'vs/nls';
 import { IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWebviewService, WebviewService } from './webviewService';
+import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService';
 import { WebviewInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewInputFactory';
 
 (Registry.as<IEditorRegistry>(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(
@@ -24,4 +24,4 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 	WebviewInputFactory.ID,
 	WebviewInputFactory);
 
-registerSingleton(IWebviewService, WebviewService);
+registerSingleton(IWebviewEditorService, WebviewEditorService);
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
similarity index 96%
rename from src/vs/workbench/parts/webview/electron-browser/webviewService.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
index 6a04dfb4027..4d8b81c9872 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -12,9 +12,9 @@ import * as vscode from 'vscode';
 import { WebviewEditorInput } from './webviewInput';
 import { TPromise } from 'vs/base/common/winjs.base';
 
-export const IWebviewService = createDecorator<IWebviewService>('webviewService');
+export const IWebviewEditorService = createDecorator<IWebviewEditorService>('webviewEditorService');
 
-export interface IWebviewService {
+export interface IWebviewEditorService {
 	_serviceBrand: any;
 
 	createWebview(
@@ -70,7 +70,7 @@ export interface WebviewInputOptions extends vscode.WebviewOptions {
 	tryRestoreScrollPosition?: boolean;
 }
 
-export class WebviewService implements IWebviewService {
+export class WebviewEditorService implements IWebviewEditorService {
 	_serviceBrand: any;
 
 	private readonly _revivers = new Map<string, WebviewReviver>();
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
index 10d3d0be8b4..6ad462ffcfe 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
@@ -12,7 +12,7 @@ import { IEditorInput, IEditorModel, Position } from 'vs/platform/editor/common/
 import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
 import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
-import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewService';
+import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewEditorService';
 
 
 export class WebviewEditorInput extends EditorInput {
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
index a6f4edb387f..6bd2c206c8a 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
@@ -7,7 +7,7 @@
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorInputFactory } from 'vs/workbench/common/editor';
-import { IWebviewService, WebviewInputOptions } from './webviewService';
+import { IWebviewEditorService, WebviewInputOptions } from './webviewEditorService';
 import { WebviewEditorInput } from './webviewInput';
 
 interface SerializedWebview {
@@ -23,7 +23,7 @@ export class WebviewInputFactory implements IEditorInputFactory {
 	public static readonly ID = WebviewEditorInput.typeId;
 
 	public constructor(
-		@IWebviewService private readonly _webviewService: IWebviewService
+		@IWebviewEditorService private readonly _webviewService: IWebviewEditorService
 	) { }
 
 	public serialize(

From 2bf113ef45cb11325cb68ae17ab09ab3516ad1a2 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 18:35:27 -0700
Subject: [PATCH 358/383] Webview -> WebviewElement

---
 .../parts/extensions/electron-browser/extensionEditor.ts  | 6 +++---
 .../parts/html/electron-browser/baseWebviewEditor.ts      | 4 ++--
 .../parts/html/electron-browser/htmlPreviewPart.ts        | 6 +++---
 src/vs/workbench/parts/html/electron-browser/webview.ts   | 2 +-
 .../parts/html/electron-browser/webviewFindWidget.ts      | 4 ++--
 .../parts/webview/electron-browser/webviewEditor.ts       | 6 +++---
 .../parts/webview/electron-browser/webviewInput.ts        | 8 ++++----
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index 5f42b7941f4..1debc54911a 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -32,7 +32,7 @@ import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
@@ -177,7 +177,7 @@ export class ExtensionEditor extends BaseEditor {
 	private contentDisposables: IDisposable[] = [];
 	private transientDisposables: IDisposable[] = [];
 	private disposables: IDisposable[];
-	private activeWebview: Webview;
+	private activeWebview: WebviewElement;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -425,7 +425,7 @@ export class ExtensionEditor extends BaseEditor {
 			.then<void>(body => {
 				const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders;
 				const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : {};
-				this.activeWebview = new Webview(this.partService.getContainer(Parts.EDITOR_PART), this.themeService, this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions);
+				this.activeWebview = new WebviewElement(this.partService.getContainer(Parts.EDITOR_PART), this.themeService, this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions);
 				this.activeWebview.mountTo(this.content);
 				const removeLayoutParticipant = arrays.insert(this.layoutParticipants, this.activeWebview);
 				this.contentDisposables.push(toDisposable(removeLayoutParticipant));
diff --git a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts b/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
index d32bae9298d..e7e6b36abb2 100644
--- a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
+++ b/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
@@ -8,7 +8,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 import { IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import { Webview } from './webview';
+import { WebviewElement } from './webview';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { Dimension } from 'vs/base/browser/dom';
 
@@ -25,7 +25,7 @@ export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE = new RawContextKey<
  */
 export abstract class BaseWebviewEditor extends BaseEditor {
 
-	protected _webview: Webview | undefined;
+	protected _webview: WebviewElement | undefined;
 	protected contextKey: IContextKey<boolean>;
 	protected findWidgetVisible: IContextKey<boolean>;
 	protected findInputFocusContextKey: IContextKey<boolean>;
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index a4fa6c015c1..8b996f0ae43 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -20,7 +20,7 @@ import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/r
 import { Parts, IPartService } from 'vs/workbench/services/part/common/partService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Webview, WebviewOptions } from './webview';
+import { WebviewElement, WebviewOptions } from './webview';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { BaseWebviewEditor } from './baseWebviewEditor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -84,14 +84,14 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		parent.appendChild(this._content);
 	}
 
-	private get webview(): Webview {
+	private get webview(): WebviewElement {
 		if (!this._webview) {
 			let webviewOptions: WebviewOptions = {};
 			if (this.input && this.input instanceof HtmlInput) {
 				webviewOptions = this.input.options;
 			}
 
-			this._webview = new Webview(
+			this._webview = new WebviewElement(
 				this._partService.getContainer(Parts.EDITOR_PART),
 				this.themeService,
 				this._environmentService,
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.ts b/src/vs/workbench/parts/html/electron-browser/webview.ts
index d33a1c750f8..0ea8ed3965e 100644
--- a/src/vs/workbench/parts/html/electron-browser/webview.ts
+++ b/src/vs/workbench/parts/html/electron-browser/webview.ts
@@ -25,7 +25,7 @@ export interface WebviewOptions {
 	readonly localResourceRoots?: URI[];
 }
 
-export class Webview {
+export class WebviewElement {
 	private readonly _webview: Electron.WebviewTag;
 	private _ready: Promise<this>;
 	private _disposables: IDisposable[] = [];
diff --git a/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts b/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
index f304d2f56eb..46bd1c33785 100644
--- a/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
+++ b/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
@@ -5,13 +5,13 @@
 
 import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { Webview } from './webview';
+import { WebviewElement } from './webview';
 
 export class WebviewFindWidget extends SimpleFindWidget {
 
 	constructor(
 		@IContextViewService contextViewService: IContextViewService,
-		private readonly webview: Webview
+		private readonly webview: WebviewElement
 	) {
 		super(contextViewService);
 	}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index 96b53745e4c..a07a1355d56 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -8,7 +8,7 @@ import { IDisposable, } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
 import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from 'vs/workbench/parts/html/electron-browser/baseWebviewEditor';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -179,7 +179,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 		return rootPaths;
 	}
 
-	private getWebview(input: WebviewEditorInput): Webview {
+	private getWebview(input: WebviewEditorInput): WebviewElement {
 		if (this._webview) {
 			return this._webview;
 		}
@@ -203,7 +203,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 			this.findWidgetVisible = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
 		}
 
-		this._webview = new Webview(
+		this._webview = new WebviewElement(
 			this._partService.getContainer(Parts.EDITOR_PART),
 			this.themeService,
 			this._environmentService,
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
index 6ad462ffcfe..0044f61808f 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
@@ -10,7 +10,7 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorInput, IEditorModel, Position } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewEditorService';
 
@@ -26,7 +26,7 @@ export class WebviewEditorInput extends EditorInput {
 	private _currentWebviewHtml: string = '';
 	public _events: WebviewEvents | undefined;
 	private _container: HTMLElement;
-	private _webview: Webview | undefined;
+	private _webview: WebviewElement | undefined;
 	private _webviewOwner: any;
 	private _webviewDisposables: IDisposable[] = [];
 	private _position?: Position;
@@ -163,11 +163,11 @@ export class WebviewEditorInput extends EditorInput {
 		return this._container;
 	}
 
-	public get webview(): Webview | undefined {
+	public get webview(): WebviewElement | undefined {
 		return this._webview;
 	}
 
-	public set webview(value: Webview) {
+	public set webview(value: WebviewElement) {
 		this._webviewDisposables = dispose(this._webviewDisposables);
 
 		this._webview = value;

From ca3341f659c637c0817eac3b8eef8756e940f393 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 18:45:09 -0700
Subject: [PATCH 359/383] Move main webview contributions from html to webview

---
 build/gulpfile.vscode.js                      |  2 +-
 .../api/electron-browser/mainThreadWebview.ts |  4 +-
 .../electron-browser/extensionEditor.ts       |  2 +-
 .../electron-browser/html.contribution.ts     |  2 -
 .../html/electron-browser/htmlPreviewPart.ts  |  4 +-
 .../electron-browser/webview.contribution.ts  | 70 -----------------
 .../electron-browser/baseWebviewEditor.ts     |  0
 .../electron-browser/webview-pre.js           |  0
 .../electron-browser/webview.contribution.ts  | 78 +++++++++++++++++--
 .../electron-browser/webview.html             |  0
 .../electron-browser/webview.ts               |  0
 .../electron-browser/webviewCommands.ts       |  0
 .../webview/electron-browser/webviewEditor.ts |  4 +-
 .../electron-browser/webviewFindWidget.ts     |  0
 .../webview/electron-browser/webviewInput.ts  |  2 +-
 15 files changed, 79 insertions(+), 89 deletions(-)
 delete mode 100644 src/vs/workbench/parts/html/electron-browser/webview.contribution.ts
 rename src/vs/workbench/parts/{html => webview}/electron-browser/baseWebviewEditor.ts (100%)
 rename src/vs/workbench/parts/{html => webview}/electron-browser/webview-pre.js (100%)
 rename src/vs/workbench/parts/{html => webview}/electron-browser/webview.html (100%)
 rename src/vs/workbench/parts/{html => webview}/electron-browser/webview.ts (100%)
 rename src/vs/workbench/parts/{html => webview}/electron-browser/webviewCommands.ts (100%)
 rename src/vs/workbench/parts/{html => webview}/electron-browser/webviewFindWidget.ts (100%)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 403d4faad4c..ff34bc6dd53 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -78,7 +78,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/electron-browser/bootstrap/**',
 	'out-build/vs/workbench/parts/debug/**/*.json',
 	'out-build/vs/workbench/parts/execution/**/*.scpt',
-	'out-build/vs/workbench/parts/html/electron-browser/webview-pre.js',
+	'out-build/vs/workbench/parts/webview/electron-browser/webview-pre.js',
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/parts/tasks/**/*.json',
 	'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 71e7a3166fe..e01164bc465 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -13,7 +13,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewHandle } from 'vs/workbench/api/node/extHost.protocol';
 import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor';
 import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
-import { IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewService';
+import { IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
@@ -44,7 +44,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		@IEditorGroupService editorGroupService: IEditorGroupService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
-		@IWebviewService private readonly _webviewService: IWebviewEditorService,
+		@IWebviewEditorService private readonly _webviewService: IWebviewEditorService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index 1debc54911a..f226215c4b1 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -32,7 +32,7 @@ import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webview';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
diff --git a/src/vs/workbench/parts/html/electron-browser/html.contribution.ts b/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
index 1d7f0a29cac..d94d09a13a7 100644
--- a/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
+++ b/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
@@ -18,8 +18,6 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
 import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 
-import './webview.contribution';
-
 function getActivePreviewsForResource(accessor: ServicesAccessor, resource: URI | string) {
 	const uri = resource instanceof URI ? resource : URI.parse(resource);
 	return accessor.get(IWorkbenchEditorService).getVisibleEditors()
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index 8b996f0ae43..35851edfa8a 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -20,13 +20,13 @@ import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/r
 import { Parts, IPartService } from 'vs/workbench/services/part/common/partService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { WebviewElement, WebviewOptions } from './webview';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { BaseWebviewEditor } from './baseWebviewEditor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import URI from 'vs/base/common/uri';
 import { Scope } from 'vs/workbench/common/memento';
 import { Dimension } from 'vs/base/browser/dom';
+import { BaseWebviewEditor } from 'vs/workbench/parts/webview/electron-browser/baseWebviewEditor';
+import { WebviewElement, WebviewOptions } from 'vs/workbench/parts/webview/electron-browser/webview';
 
 export interface HtmlPreviewEditorViewState {
 	scrollYPercentage: number;
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/html/electron-browser/webview.contribution.ts
deleted file mode 100644
index f6697f659f6..00000000000
--- a/src/vs/workbench/parts/html/electron-browser/webview.contribution.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as nls from 'vs/nls';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr, } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-
-import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
-import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ShowWebViewEditorFindTermCommand, HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindWidgetCommand } from './webviewCommands';
-
-const webviewDeveloperCategory = nls.localize('developer', "Developer");
-
-const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-
-const showNextFindWdigetCommand = new ShowWebViewEditorFindWidgetCommand({
-	id: ShowWebViewEditorFindWidgetCommand.ID,
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-	kbOpts: {
-		primary: KeyMod.CtrlCmd | KeyCode.KEY_F
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindWdigetCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-
-const showNextFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showNextFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.DownArrow
-	}
-}, true);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-const showPreviousFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showPreviousFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.UpArrow
-	}
-}, false);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-
-const hideCommand = new HideWebViewEditorFindCommand({
-	id: HideWebViewEditorFindCommand.Id,
-	precondition: ContextKeyExpr.and(
-		KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-		KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
-	kbOpts: {
-		primary: KeyCode.Escape
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(hideCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-
-actionRegistry.registerWorkbenchAction(
-	new SyncActionDescriptor(OpenWebviewDeveloperToolsAction, OpenWebviewDeveloperToolsAction.ID, OpenWebviewDeveloperToolsAction.LABEL),
-	'Webview Tools',
-	webviewDeveloperCategory);
-
-actionRegistry.registerWorkbenchAction(
-	new SyncActionDescriptor(ReloadWebviewAction, ReloadWebviewAction.ID, ReloadWebviewAction.LABEL),
-	'Reload Webview',
-	webviewDeveloperCategory);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
rename to src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
diff --git a/src/vs/workbench/parts/html/electron-browser/webview-pre.js b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/webview-pre.js
rename to src/vs/workbench/parts/webview/electron-browser/webview-pre.js
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
index cefbd347ca2..ec1e97a3fc8 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
@@ -2,17 +2,23 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
-import { WebviewEditor } from './webviewEditor';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { WebviewEditorInput } from './webviewInput';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
-import { IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService';
+import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
+import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
+import { IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { WebviewInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewInputFactory';
+import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
+import { HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindTermCommand, ShowWebViewEditorFindWidgetCommand } from './webviewCommands';
+import { WebviewEditor } from './webviewEditor';
+import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService';
+import { WebviewEditorInput } from './webviewInput';
 
 (Registry.as<IEditorRegistry>(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(
 	WebviewEditor,
@@ -25,3 +31,59 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 	WebviewInputFactory);
 
 registerSingleton(IWebviewEditorService, WebviewEditorService);
+
+
+const webviewDeveloperCategory = localize('developer', "Developer");
+
+const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
+
+const showNextFindWdigetCommand = new ShowWebViewEditorFindWidgetCommand({
+	id: ShowWebViewEditorFindWidgetCommand.ID,
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
+	kbOpts: {
+		primary: KeyMod.CtrlCmd | KeyCode.KEY_F
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindWdigetCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+
+const showNextFindTermCommand = new ShowWebViewEditorFindTermCommand({
+	id: 'editor.action.webvieweditor.showNextFindTerm',
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
+	kbOpts: {
+		primary: KeyMod.Alt | KeyCode.DownArrow
+	}
+}, true);
+KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+const showPreviousFindTermCommand = new ShowWebViewEditorFindTermCommand({
+	id: 'editor.action.webvieweditor.showPreviousFindTerm',
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
+	kbOpts: {
+		primary: KeyMod.Alt | KeyCode.UpArrow
+	}
+}, false);
+KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+
+const hideCommand = new HideWebViewEditorFindCommand({
+	id: HideWebViewEditorFindCommand.Id,
+	precondition: ContextKeyExpr.and(
+		KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
+		KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
+	kbOpts: {
+		primary: KeyCode.Escape
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(hideCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+
+actionRegistry.registerWorkbenchAction(
+	new SyncActionDescriptor(OpenWebviewDeveloperToolsAction, OpenWebviewDeveloperToolsAction.ID, OpenWebviewDeveloperToolsAction.LABEL),
+	'Webview Tools',
+	webviewDeveloperCategory);
+
+actionRegistry.registerWorkbenchAction(
+	new SyncActionDescriptor(ReloadWebviewAction, ReloadWebviewAction.ID, ReloadWebviewAction.LABEL),
+	'Reload Webview',
+	webviewDeveloperCategory);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.html b/src/vs/workbench/parts/webview/electron-browser/webview.html
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/webview.html
rename to src/vs/workbench/parts/webview/electron-browser/webview.html
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.ts b/src/vs/workbench/parts/webview/electron-browser/webview.ts
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/webview.ts
rename to src/vs/workbench/parts/webview/electron-browser/webview.ts
diff --git a/src/vs/workbench/parts/html/electron-browser/webviewCommands.ts b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/webviewCommands.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index a07a1355d56..23daffa343d 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -7,8 +7,8 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
-import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from 'vs/workbench/parts/html/electron-browser/baseWebviewEditor';
-import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
+import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
+import { WebviewElement } from './webview';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
diff --git a/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts b/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
index 0044f61808f..a206f9ba3db 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
@@ -10,7 +10,7 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorInput, IEditorModel, Position } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
-import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from './webview';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewEditorService';
 

From 0dd891bbcf91f065aa7faf49c8454f06ac721f58 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 18:48:53 -0700
Subject: [PATCH 360/383] Chagne webview element file name

---
 .../parts/extensions/electron-browser/extensionEditor.ts        | 2 +-
 src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts | 2 +-
 .../parts/webview/electron-browser/baseWebviewEditor.ts         | 2 +-
 .../workbench/parts/webview/electron-browser/webviewEditor.ts   | 2 +-
 .../webview/electron-browser/{webview.ts => webviewElement.ts}  | 0
 .../parts/webview/electron-browser/webviewFindWidget.ts         | 2 +-
 src/vs/workbench/parts/webview/electron-browser/webviewInput.ts | 2 +-
 .../parts/webview/electron-browser/webviewInputFactory.ts       | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/vs/workbench/parts/webview/electron-browser/{webview.ts => webviewElement.ts} (100%)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index f226215c4b1..91a7f2f6ed9 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -32,7 +32,7 @@ import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index 35851edfa8a..793cadb9ee0 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -26,7 +26,7 @@ import URI from 'vs/base/common/uri';
 import { Scope } from 'vs/workbench/common/memento';
 import { Dimension } from 'vs/base/browser/dom';
 import { BaseWebviewEditor } from 'vs/workbench/parts/webview/electron-browser/baseWebviewEditor';
-import { WebviewElement, WebviewOptions } from 'vs/workbench/parts/webview/electron-browser/webview';
+import { WebviewElement, WebviewOptions } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
 
 export interface HtmlPreviewEditorViewState {
 	scrollYPercentage: number;
diff --git a/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
index e7e6b36abb2..047cc8bbb38 100644
--- a/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
@@ -8,7 +8,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 import { IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import { WebviewElement } from './webview';
+import { WebviewElement } from './webviewElement';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { Dimension } from 'vs/base/browser/dom';
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index 23daffa343d..f7e00e4c9bb 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -8,7 +8,7 @@ import { IDisposable, } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
 import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
-import { WebviewElement } from './webview';
+import { WebviewElement } from './webviewElement';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.ts b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
similarity index 100%
rename from src/vs/workbench/parts/webview/electron-browser/webview.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts b/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
index 46bd1c33785..13ca4b99ce4 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
@@ -5,7 +5,7 @@
 
 import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { WebviewElement } from './webview';
+import { WebviewElement } from './webviewElement';
 
 export class WebviewFindWidget extends SimpleFindWidget {
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
index a206f9ba3db..18b09dac459 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
@@ -10,7 +10,7 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorInput, IEditorModel, Position } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
-import { WebviewElement } from './webview';
+import { WebviewElement } from './webviewElement';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewEditorService';
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
index 6bd2c206c8a..a19662206fe 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
@@ -29,7 +29,7 @@ export class WebviewInputFactory implements IEditorInputFactory {
 	public serialize(
 		input: WebviewEditorInput
 	): string {
-		// Has not state, don't revive
+		// Has no state, don't revive
 		if (!input.state) {
 			return null;
 		}

From 27c7990db426a214e27613b435fe1950b81a2a38 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 18:54:20 -0700
Subject: [PATCH 361/383] Extracting out duplicate code

---
 .../electron-browser/webviewCommands.ts       | 38 +++++--------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
index eed860fc157..69077a33112 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
@@ -16,20 +16,10 @@ export class ShowWebViewEditorFindWidgetCommand extends Command {
 	public static readonly ID = 'editor.action.webvieweditor.showFind';
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
+		const webViewEditor = getActiveWebviewEditor(accessor);
 		if (webViewEditor) {
 			webViewEditor.showFind();
 		}
-		return null;
-	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): BaseWebviewEditor {
-		const workbenchEditorService = accessor.get(IWorkbenchEditorService);
-		const activeEditor = workbenchEditorService.getActiveEditor() as BaseWebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
 	}
 }
 
@@ -37,19 +27,11 @@ export class HideWebViewEditorFindCommand extends Command {
 	public static readonly Id = 'editor.action.webvieweditor.hideFind';
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
+		const webViewEditor = getActiveWebviewEditor(accessor);
 		if (webViewEditor) {
 			webViewEditor.hideFind();
 		}
 	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): BaseWebviewEditor {
-		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as BaseWebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
-	}
 }
 
 export class ShowWebViewEditorFindTermCommand extends Command {
@@ -60,7 +42,7 @@ export class ShowWebViewEditorFindTermCommand extends Command {
 	}
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
+		const webViewEditor = getActiveWebviewEditor(accessor);
 		if (webViewEditor) {
 			if (this._next) {
 				webViewEditor.showNextFindTerm();
@@ -69,14 +51,6 @@ export class ShowWebViewEditorFindTermCommand extends Command {
 			}
 		}
 	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): BaseWebviewEditor {
-		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as BaseWebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
-	}
 }
 
 export class OpenWebviewDeveloperToolsAction extends Action {
@@ -127,4 +101,10 @@ export class ReloadWebviewAction extends Action {
 			.filter(c => c && (c as any).isWebviewEditor)
 			.map(e => e as BaseWebviewEditor);
 	}
+}
+
+function getActiveWebviewEditor(accessor: ServicesAccessor): BaseWebviewEditor | null {
+	const workbenchEditorService = accessor.get(IWorkbenchEditorService);
+	const activeEditor = workbenchEditorService.getActiveEditor() as BaseWebviewEditor;
+	return activeEditor.isWebviewEditor ? activeEditor : null;
 }
\ No newline at end of file

From e873a42e2777dcbc3d119b7278ec48a03c31375e Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 19:02:35 -0700
Subject: [PATCH 362/383] Fix possible webview exception

---
 src/vs/workbench/api/node/extHostWebview.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 3a316bb6baf..98b9fc2fc5f 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -252,6 +252,9 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		webviewHandle: WebviewHandle
 	): Thenable<any> {
 		const webview = this.getWebview(webviewHandle);
+		if (!webview) {
+			return TPromise.as(undefined);
+		}
 
 		const serialzer = this._serializers.get(webview.viewType);
 		if (!serialzer) {
@@ -261,7 +264,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		return serialzer.serializeWebview(webview);
 	}
 
-	private getWebview(handle: WebviewHandle) {
+	private getWebview(handle: WebviewHandle): ExtHostWebview | undefined {
 		return this._webviews.get(handle);
 	}
 }
\ No newline at end of file

From 753b18ddc1e93ec4b2cb18738b0c3fbbff06cace Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 19:04:45 -0700
Subject: [PATCH 363/383] Handle exceptions in webview serialize

---
 src/vs/workbench/api/electron-browser/mainThreadWebview.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index e01164bc465..3e1bb1afbff 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -166,7 +166,9 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 
 		const reviveResponses = toRevive.map(handle =>
 			TPromise.any([
-				this._proxy.$serializeWebview(handle).then(state => ({ handle, state })),
+				this._proxy.$serializeWebview(handle).then(
+					state => ({ handle, state }),
+					() => ({ handle, state: null })),
 				TPromise.timeout(MainThreadWebviews.serializeTimeout).then(() => ({ handle, state: null }))
 			]).then(x => x.value));
 

From c14e30aeb4da6bc6baf3c9294f9fc8e11dedbe54 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 19:18:55 -0700
Subject: [PATCH 364/383] Show error when webview restore fails

---
 .../src/features/previewManager.ts            |  3 +--
 src/vs/vscode.proposed.d.ts                   |  4 +---
 .../api/electron-browser/mainThreadWebview.ts | 20 +++++++++++++++++--
 src/vs/workbench/api/node/extHost.protocol.ts |  2 +-
 src/vs/workbench/api/node/extHostWebview.ts   |  4 ++--
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts
index 7186ea4e4bb..3f458a7fa91 100644
--- a/extensions/markdown-language-features/src/features/previewManager.ts
+++ b/extensions/markdown-language-features/src/features/previewManager.ts
@@ -91,7 +91,7 @@ export class MarkdownPreviewManager implements vscode.WebviewSerializer {
 	public async deserializeWebview(
 		webview: vscode.Webview,
 		state: any
-	): Promise<boolean> {
+	): Promise<void> {
 		const preview = await MarkdownPreview.revive(
 			webview,
 			state,
@@ -101,7 +101,6 @@ export class MarkdownPreviewManager implements vscode.WebviewSerializer {
 			this.topmostLineMonitor);
 
 		this.registerPreview(preview);
-		return true;
 	}
 
 	public async serializeWebview(
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 33c125d8467..f61737f5919 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -658,10 +658,8 @@ declare module 'vscode' {
 		 *
 		 * @param webview Webview to restore. The serializer should take ownership of this webview.
 		 * @param state Persisted state.
-		 *
-		 * @return Was deserialization successful?
 		 */
-		deserializeWebview(webview: Webview, state: any): Thenable<boolean>;
+		deserializeWebview(webview: Webview, state: any): Thenable<void>;
 	}
 
 	namespace window {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 3e1bb1afbff..983ad4707cd 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.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 { localize } from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as map from 'vs/base/common/map';
 import URI from 'vs/base/common/uri';
@@ -132,7 +133,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 	}
 
 	reviveWebview(webview: WebviewEditorInput): TPromise<void> {
-		return this._extensionService.activateByEvent(`onView:${webview.state.viewType}`).then(() => {
+		const viewType = webview.state.viewType;
+		return this._extensionService.activateByEvent(`onView:${viewType}`).then(() => {
 			const handle = 'revival-' + MainThreadWebviews.revivalPool++;
 			this._webviews.set(handle, webview);
 
@@ -148,7 +150,9 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			};
 
 			return this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options)
-				.then(() => { });
+				.then(undefined, () => {
+					webview.html = MainThreadWebviews.getDeserializationFailedContents(viewType);
+				});
 		});
 	}
 
@@ -231,4 +235,16 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			this._openerService.open(link);
 		}
 	}
+
+	private static getDeserializationFailedContents(viewType: string) {
+		return `<!DOCTYPE html>
+		<html>
+			<head>
+				<base href="https://code.visualstudio.com/raw/">
+				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src https: data:; media-src https:; script-src 'none'; style-src vscode-core-resource: https: 'unsafe-inline'; child-src 'none'; frame-src 'none';">
+			</head>
+			<body>${localize('errorMessage', "An error occurred while restoring view:{0}", viewType)}</body>
+		</html>`;
+	}
 }
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 4c37176f89b..3e8c56318dc 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -366,7 +366,7 @@ export interface ExtHostWebviewsShape {
 	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void;
 	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void>;
 	$onDidChangePosition(handle: WebviewHandle, newPosition: EditorPosition): void;
-	$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): Thenable<boolean>;
+	$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): Thenable<void>;
 	$serializeWebview(webviewHandle: WebviewHandle): Thenable<any>;
 }
 
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 98b9fc2fc5f..537c42e5107 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -237,10 +237,10 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		state: any,
 		position: Position,
 		options: vscode.WebviewOptions
-	): Thenable<boolean> {
+	): Thenable<void> {
 		const serializer = this._serializers.get(viewType);
 		if (!serializer) {
-			return TPromise.as(false);
+			return TPromise.wrapError(new Error(`No serializer found for '${viewType}'`));
 		}
 
 		const revivedWebview = new ExtHostWebview(webviewHandle, this._proxy, viewType, typeConverters.toViewColumn(position), options);

From 15bc74647a74eb39ce2c75b8631f12568a7acd9f Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 19:30:16 -0700
Subject: [PATCH 365/383] Use correct promise type

---
 src/vs/workbench/api/electron-browser/mainThreadWebview.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 983ad4707cd..b741b81b3d9 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -110,7 +110,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		this._webviewService.revealWebview(webview, column);
 	}
 
-	async $sendMessage(handle: WebviewHandle, message: any): Promise<boolean> {
+	async $sendMessage(handle: WebviewHandle, message: any): TPromise<boolean> {
 		const webview = this.getWebview(handle);
 		const editors = this._editorService.getVisibleEditors()
 			.filter(e => e instanceof WebviewEditor)

From bcdbb50e5d647c11f6ef167200c227fa4d587e77 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 19:48:15 -0700
Subject: [PATCH 366/383] Extract out duplicate webview event handler logic

---
 .../api/electron-browser/mainThreadWebview.ts | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index b741b81b3d9..6bfdd804647 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -71,17 +71,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		options: WebviewInputOptions,
 		extensionFolderPath: string
 	): void {
-		const webview = this._webviewService.createWebview(MainThreadWebviews.viewType, title, column, options, extensionFolderPath, {
-			onDidClickLink: uri => this.onDidClickLink(uri, webview.options),
-			onMessage: message => this._proxy.$onMessage(handle, message),
-			onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
-			onDispose: () => {
-				this._proxy.$onDidDisposeWeview(handle).then(() => {
-					this._webviews.delete(handle);
-				});
-			}
-		});
-
+		const webview = this._webviewService.createWebview(MainThreadWebviews.viewType, title, column, options, extensionFolderPath, this.createWebviewEventDelegate(handle));
 		webview.state = {
 			viewType: viewType,
 			state: undefined
@@ -137,17 +127,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		return this._extensionService.activateByEvent(`onView:${viewType}`).then(() => {
 			const handle = 'revival-' + MainThreadWebviews.revivalPool++;
 			this._webviews.set(handle, webview);
-
-			webview._events = {
-				onDidClickLink: uri => this.onDidClickLink(uri, webview.options),
-				onMessage: message => this._proxy.$onMessage(handle, message),
-				onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
-				onDispose: () => {
-					this._proxy.$onDidDisposeWeview(handle).then(() => {
-						this._webviews.delete(handle);
-					});
-				}
-			};
+			webview._events = this.createWebviewEventDelegate(handle);
 
 			return this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options)
 				.then(undefined, () => {
@@ -191,6 +171,19 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		});
 	}
 
+	private createWebviewEventDelegate(handle: WebviewHandle) {
+		return {
+			onDidClickLink: uri => this.onDidClickLink(handle, uri),
+			onMessage: message => this._proxy.$onMessage(handle, message),
+			onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
+			onDispose: () => {
+				this._proxy.$onDidDisposeWeview(handle).then(() => {
+					this._webviews.delete(handle);
+				});
+			}
+		};
+	}
+
 	private getWebview(handle: WebviewHandle): WebviewEditorInput {
 		const webview = this._webviews.get(handle);
 		if (!webview) {
@@ -225,12 +218,13 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		}
 	}
 
-	private onDidClickLink(link: URI, options: WebviewInputOptions): void {
+	private onDidClickLink(handle: WebviewHandle, link: URI): void {
 		if (!link) {
 			return;
 		}
 
-		const enableCommandUris = options.enableCommandUris;
+		const webview = this.getWebview(handle);
+		const enableCommandUris = webview.options.enableCommandUris;
 		if (MainThreadWebviews.standardSupportedLinkSchemes.indexOf(link.scheme) >= 0 || enableCommandUris && link.scheme === 'command') {
 			this._openerService.open(link);
 		}

From 4ba9ac40f14730c7fae2ff07a84dde2cd9c4ee56 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 19:58:41 -0700
Subject: [PATCH 367/383] Fix rename provider error on empty work range

Fixes #47276
---
 src/vs/editor/contrib/rename/rename.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index 718e5cc9dbc..8c1b35360ea 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -139,6 +139,10 @@ class RenameController implements IEditorContribution {
 			return undefined;
 		}
 
+		if (!range) {
+			return undefined;
+		}
+
 		let text = this.editor.getModel().getValueInRange(range);
 		let selection = this.editor.getSelection();
 		let selectionStart = 0;

From 0ab93fc65d71f18ec7ef33c9027e215f7807f45f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 6 Apr 2018 07:39:31 +0200
Subject: [PATCH 368/383] fix "Close Editors to the Right" action (fixes
 #46887)

---
 src/vs/workbench/browser/parts/editor/editorPart.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 22d490f27e1..9f79d7af329 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -826,16 +826,18 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Close: By Filter or all
 		else {
-			editorsToClose = group.getEditors(true /* in MRU order */);
 			filter = filterOrEditors || Object.create(null);
 
+			const hasDirection = !types.isUndefinedOrNull(filter.direction);
+			editorsToClose = group.getEditors(!hasDirection /* in MRU order only if direction is not specified */);
+
 			// Filter: saved only
 			if (filter.savedOnly) {
 				editorsToClose = editorsToClose.filter(e => !e.isDirty());
 			}
 
 			// Filter: direction (left / right)
-			else if (!types.isUndefinedOrNull(filter.direction)) {
+			else if (hasDirection) {
 				editorsToClose = (filter.direction === Direction.LEFT) ? editorsToClose.slice(0, group.indexOf(filter.except)) : editorsToClose.slice(group.indexOf(filter.except) + 1);
 			}
 

From b3c8c30abadbf7c181581e07f12e9924b99ae879 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 6 Apr 2018 07:45:30 +0200
Subject: [PATCH 369/383] debt - introduce a helper to store editor view state
 with a upper limit

---
 src/vs/base/common/map.ts                     |  18 +++
 src/vs/base/test/common/map.test.ts           |  27 ++++
 .../browser/parts/editor/textDiffEditor.ts    |  10 +-
 .../browser/parts/editor/textEditor.ts        |  52 +++----
 .../parts/editor/textResourceEditor.ts        |  12 +-
 src/vs/workbench/common/editor.ts             | 109 +++++++++++++++
 .../html/electron-browser/htmlPreviewPart.ts  |  58 ++++----
 .../electron-browser/walkThroughPart.ts       |  69 ++++------
 .../test/common/editor/editor.test.ts         | 129 +++++++++++++++++-
 9 files changed, 358 insertions(+), 126 deletions(-)

diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
index 1cfda2446d3..edd2f16345e 100644
--- a/src/vs/base/common/map.ts
+++ b/src/vs/base/common/map.ts
@@ -743,6 +743,24 @@ export class LinkedMap<K, V> {
 			this._tail = item;
 		}
 	}
+
+	public toJSON(): [K, V][] {
+		const data: [K, V][] = [];
+
+		this.forEach((value, key) => {
+			data.push([key, value]);
+		});
+
+		return data;
+	}
+
+	public fromJSON(data: [K, V][]): void {
+		this.clear();
+
+		for (const [key, value] of data) {
+			this.set(key, value);
+		}
+	}
 }
 
 export class LRUCache<K, V> extends LinkedMap<K, V> {
diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts
index 11420c395e3..2d04f0174c8 100644
--- a/src/vs/base/test/common/map.test.ts
+++ b/src/vs/base/test/common/map.test.ts
@@ -200,6 +200,33 @@ suite('Map', () => {
 		assert.deepStrictEqual(cache.values(), values);
 	});
 
+	test('LinkedMap - toJSON / fromJSON', () => {
+		let map = new LinkedMap<string, string>();
+		map.set('ak', 'av');
+		map.set('bk', 'bv');
+		map.set('ck', 'cv');
+
+		const json = map.toJSON();
+		map = new LinkedMap<string, string>();
+		map.fromJSON(json);
+
+		let i = 0;
+		map.forEach((value, key) => {
+			if (i === 0) {
+				assert.equal(key, 'ak');
+				assert.equal(value, 'av');
+			} else if (i === 1) {
+				assert.equal(key, 'bk');
+				assert.equal(value, 'bv');
+			} else if (i === 2) {
+				assert.equal(key, 'ck');
+				assert.equal(value, 'cv');
+			}
+
+			i++;
+		});
+	});
+
 	test('PathIterator', function () {
 		const iter = new PathIterator();
 		iter.reset('file:///usr/bin/file.txt');
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 169c1c9b94a..4ae57f9146b 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -143,7 +143,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
 
 		// Remember view settings if input changes
-		this.saveTextDiffEditorViewStateForInput(this.input);
+		this.saveTextDiffEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options).then(() => {
@@ -172,7 +172,7 @@ export class TextDiffEditor extends BaseTextEditor {
 				// Otherwise restore View State
 				let hasPreviousViewState = false;
 				if (!optionsGotApplied) {
-					hasPreviousViewState = this.restoreViewState(input);
+					hasPreviousViewState = this.restoreTextDiffEditorViewState(input);
 				}
 
 				this.diffNavigator = new DiffNavigator(diffEditor, {
@@ -199,7 +199,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		});
 	}
 
-	private restoreViewState(input: EditorInput): boolean {
+	private restoreTextDiffEditorViewState(input: EditorInput): boolean {
 		if (input instanceof DiffEditorInput) {
 			const resource = this.toDiffEditorViewStateResource(input);
 			if (resource) {
@@ -306,7 +306,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
 
 		// Keep editor view state in settings to restore when coming back
-		this.saveTextDiffEditorViewStateForInput(this.input);
+		this.saveTextDiffEditorViewState(this.input);
 
 		// Clear Model
 		this.getControl().setModel(null);
@@ -335,7 +335,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		return super.loadTextEditorViewState(resource) as IDiffEditorViewState;  // overridden for text diff editor support
 	}
 
-	private saveTextDiffEditorViewStateForInput(input: EditorInput): void {
+	private saveTextDiffEditorViewState(input: EditorInput): void {
 		if (!(input instanceof DiffEditorInput)) {
 			return; // only supported for diff editor inputs
 		}
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index bb7aae0c4f6..f8342b510f5 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -13,7 +13,7 @@ import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
 import * as DOM from 'vs/base/browser/dom';
 import { CodeEditor } from 'vs/editor/browser/codeEditor';
-import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { EditorInput, EditorOptions, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorViewState, IEditor } from 'vs/editor/common/editorCommon';
 import { Position } from 'vs/platform/editor/common/editor';
@@ -45,12 +45,13 @@ export abstract class BaseTextEditor extends BaseEditor {
 	private _editorContainer: HTMLElement;
 	private hasPendingConfigurationChange: boolean;
 	private lastAppliedEditorOptions: IEditorOptions;
+	private editorViewStateMemento: EditorViewStateMemento<IEditorViewState>;
 
 	constructor(
 		id: string,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IStorageService private storageService: IStorageService,
+		@IStorageService storageService: IStorageService,
 		@ITextResourceConfigurationService private readonly _configurationService: ITextResourceConfigurationService,
 		@IThemeService protected themeService: IThemeService,
 		@ITextFileService private readonly _textFileService: ITextFileService,
@@ -58,6 +59,8 @@ export abstract class BaseTextEditor extends BaseEditor {
 	) {
 		super(id, telemetryService, themeService);
 
+		this.editorViewStateMemento = new EditorViewStateMemento<IEditorViewState>(this.getMemento(storageService, Scope.WORKSPACE), TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY, 100);
+
 		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.handleConfigurationChangeEvent(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
 	}
 
@@ -237,23 +240,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 			return;
 		}
 
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-
-		let textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (!textEditorViewStateMemento) {
-			textEditorViewStateMemento = Object.create(null);
-			memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY] = textEditorViewStateMemento;
-		}
-
-		let lastKnownViewState = textEditorViewStateMemento[resource.toString()];
-		if (!lastKnownViewState) {
-			lastKnownViewState = Object.create(null);
-			textEditorViewStateMemento[resource.toString()] = lastKnownViewState;
-		}
-
-		if (typeof this.position === 'number') {
-			lastKnownViewState[this.position] = editorViewState;
-		}
+		this.editorViewStateMemento.saveState(resource, this.position, editorViewState);
 	}
 
 	protected retrieveTextEditorViewState(resource: URI): IEditorViewState {
@@ -283,27 +270,16 @@ export abstract class BaseTextEditor extends BaseEditor {
 	 * Clears the text editor view state for the given resources.
 	 */
 	protected clearTextEditorViewState(resources: URI[]): void {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		const textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (textEditorViewStateMemento) {
-			resources.forEach(resource => delete textEditorViewStateMemento[resource.toString()]);
-		}
+		resources.forEach(resource => {
+			this.editorViewStateMemento.clearState(resource);
+		});
 	}
 
 	/**
 	 * Loads the text editor view state for the given resource and returns it.
 	 */
 	protected loadTextEditorViewState(resource: URI): IEditorViewState {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		const textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (textEditorViewStateMemento) {
-			const viewState = textEditorViewStateMemento[resource.toString()];
-			if (viewState) {
-				return viewState[this.position];
-			}
-		}
-
-		return null;
+		return this.editorViewStateMemento.loadState(resource, this.position);
 	}
 
 	private updateEditorConfiguration(configuration = this.configurationService.getValue<IEditorConfiguration>(this.getResource())): void {
@@ -345,6 +321,14 @@ export abstract class BaseTextEditor extends BaseEditor {
 
 	protected abstract getAriaLabel(): string;
 
+	protected saveMemento(): void {
+
+		// ensure to first save our view state memento
+		this.editorViewStateMemento.save();
+
+		super.saveMemento();
+	}
+
 	public dispose(): void {
 		this.lastAppliedEditorOptions = void 0;
 		this.editorControl.dispose();
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
index 4157d3019e0..9e4cc6c8799 100644
--- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -67,7 +67,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		}
 
 		// Remember view settings if input changes
-		this.saveTextEditorViewStateForInput(this.input);
+		this.saveTextResourceEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options).then(() => {
@@ -97,7 +97,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 
 				// Otherwise restore View State
 				if (!optionsGotApplied) {
-					this.restoreViewState(input);
+					this.restoreTextResourceEditorViewState(input);
 				}
 
 				return void 0;
@@ -105,7 +105,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		});
 	}
 
-	private restoreViewState(input: EditorInput) {
+	private restoreTextResourceEditorViewState(input: EditorInput) {
 		if (input instanceof UntitledEditorInput || input instanceof ResourceEditorInput) {
 			const viewState = this.loadTextEditorViewState(input.getResource());
 			if (viewState) {
@@ -153,7 +153,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 	public clearInput(): void {
 
 		// Keep editor view state in settings to restore when coming back
-		this.saveTextEditorViewStateForInput(this.input);
+		this.saveTextResourceEditorViewState(this.input);
 
 		// Clear Model
 		this.getControl().setModel(null);
@@ -165,14 +165,14 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 
 		// Save View State (only for untitled)
 		if (this.input instanceof UntitledEditorInput) {
-			this.saveTextEditorViewStateForInput(this.input);
+			this.saveTextResourceEditorViewState(this.input);
 		}
 
 		// Call Super
 		super.shutdown();
 	}
 
-	protected saveTextEditorViewStateForInput(input: EditorInput): void {
+	private saveTextResourceEditorViewState(input: EditorInput): void {
 		if (!(input instanceof UntitledEditorInput) && !(input instanceof ResourceEditorInput)) {
 			return; // only enabled for untitled and resource inputs
 		}
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 12e0cbaae6b..730f4d00cec 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -17,6 +17,7 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITextModel } from 'vs/editor/common/model';
 import { Schemas } from 'vs/base/common/network';
+import { LRUCache } from 'vs/base/common/map';
 
 export const TextCompareEditorVisible = new RawContextKey<boolean>('textCompareEditorVisible', false);
 
@@ -908,6 +909,114 @@ export function toResource(editor: IEditorInput, options?: IResourceOptions): UR
 	return null;
 }
 
+export interface IEditorViewStates<T> {
+	[Position.ONE]?: T;
+	[Position.TWO]?: T;
+	[Position.THREE]?: T;
+}
+
+export class EditorViewStateMemento<T> {
+	private cache: LRUCache<string, IEditorViewStates<T>>;
+
+	constructor(private memento: object, private key: string, private limit: number = 10) { }
+
+	public saveState(resource: URI, position: Position, state: T): void;
+	public saveState(editor: EditorInput, position: Position, state: T): void;
+	public saveState(resourceOrEditor: URI | EditorInput, position: Position, state: T): void {
+		if (typeof position !== 'number') {
+			return; // we need a position at least
+		}
+
+		const resource = this.doGetResource(resourceOrEditor);
+		if (resource) {
+			const cache = this.doLoad();
+
+			let viewStates = cache.get(resource.toString());
+			if (!viewStates) {
+				viewStates = Object.create(null) as IEditorViewStates<T>;
+				cache.set(resource.toString(), viewStates);
+			}
+
+			viewStates[position] = state;
+
+			// Automatically clear when editor input gets disposed if any
+			if (resourceOrEditor instanceof EditorInput) {
+				once(resourceOrEditor.onDispose)(() => {
+					this.clearState(resource);
+				});
+			}
+		}
+	}
+
+	public loadState(resource: URI, position: Position): T;
+	public loadState(editor: EditorInput, position: Position): T;
+	public loadState(resourceOrEditor: URI | EditorInput, position: Position): T {
+		if (typeof position !== 'number') {
+			return void 0; // we need a position at least
+		}
+
+		const resource = this.doGetResource(resourceOrEditor);
+		if (resource) {
+			const cache = this.doLoad();
+
+			const viewStates = cache.get(resource.toString());
+			if (viewStates) {
+				return viewStates[position];
+			}
+		}
+
+		return void 0;
+	}
+
+	public clearState(resource: URI): void;
+	public clearState(editor: EditorInput): void;
+	public clearState(resourceOrEditor: URI | EditorInput): void {
+		const resource = this.doGetResource(resourceOrEditor);
+		if (resource) {
+			const cache = this.doLoad();
+			cache.delete(resource.toString());
+		}
+	}
+
+	private doGetResource(resourceOrEditor: URI | EditorInput): URI {
+		if (resourceOrEditor instanceof EditorInput) {
+			return resourceOrEditor.getResource();
+		}
+
+		return resourceOrEditor;
+	}
+
+	private doLoad(): LRUCache<string, IEditorViewStates<T>> {
+		if (!this.cache) {
+			this.cache = new LRUCache<string, T>(this.limit);
+
+			// Restore from serialized map state
+			const rawViewState = this.memento[this.key];
+			if (Array.isArray(rawViewState)) {
+				this.cache.fromJSON(rawViewState);
+			}
+
+			// Migration from old object state
+			else if (rawViewState) {
+				const keys = Object.keys(rawViewState);
+				keys.forEach((key, index) => {
+					if (index < this.limit) {
+						this.cache.set(key, rawViewState[key]);
+					}
+				});
+			}
+		}
+
+		return this.cache;
+	}
+
+	public save(): void {
+		const cache = this.doLoad();
+
+		this.memento[this.key] = cache.toJSON();
+	}
+}
+
 class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 	private instantiationService: IInstantiationService;
 	private fileInputFactory: IFileInputFactory;
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index 793cadb9ee0..344fef08a76 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -9,7 +9,7 @@ import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
 import { empty as EmptyDisposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
-import { EditorOptions, EditorInput } from 'vs/workbench/common/editor';
+import { EditorOptions, EditorInput, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
@@ -22,7 +22,6 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import URI from 'vs/base/common/uri';
 import { Scope } from 'vs/workbench/common/memento';
 import { Dimension } from 'vs/base/browser/dom';
 import { BaseWebviewEditor } from 'vs/workbench/parts/webview/electron-browser/baseWebviewEditor';
@@ -50,6 +49,8 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 	private _content: HTMLElement;
 	private _scrollYPercentage: number = 0;
 
+	private editorViewStateMemento: EditorViewStateMemento<HtmlPreviewEditorViewState>;
+
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
@@ -58,10 +59,12 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IPartService private readonly _partService: IPartService,
-		@IStorageService private readonly _storageService: IStorageService,
+		@IStorageService readonly _storageService: IStorageService,
 		@ITextModelService private readonly _textModelResolverService: ITextModelService
 	) {
 		super(HtmlPreviewPart.ID, telemetryService, themeService, contextKeyService);
+
+		this.editorViewStateMemento = new EditorViewStateMemento<HtmlPreviewEditorViewState>(this.getMemento(_storageService, Scope.WORKSPACE), this.viewStateStorageKey);
 	}
 
 	dispose(): void {
@@ -105,7 +108,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 			this._webview.mountTo(this._content);
 
 			if (this.input && this.input instanceof HtmlInput) {
-				const state = this.loadViewState(this.input.getResource());
+				const state = this.loadHTMLPreviewViewState(this.input);
 				this._scrollYPercentage = state ? state.scrollYPercentage : 0;
 				this.webview.initialScrollProgress = this._scrollYPercentage;
 
@@ -167,7 +170,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 	public clearInput(): void {
 		if (this.input instanceof HtmlInput) {
-			this.saveViewState(this.input.getResource(), {
+			this.saveHTMLPreviewViewState(this.input, {
 				scrollYPercentage: this._scrollYPercentage
 			});
 		}
@@ -178,7 +181,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 	public shutdown(): void {
 		if (this.input instanceof HtmlInput) {
-			this.saveViewState(this.input.getResource(), {
+			this.saveHTMLPreviewViewState(this.input, {
 				scrollYPercentage: this._scrollYPercentage
 			});
 		}
@@ -199,7 +202,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 		if (this.input instanceof HtmlInput) {
 			oldOptions = this.input.options;
-			this.saveViewState(this.input.getResource(), {
+			this.saveHTMLPreviewViewState(this.input, {
 				scrollYPercentage: this._scrollYPercentage
 			});
 		}
@@ -236,7 +239,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 						this.webview.contents = this.model.getLinesContent().join('\n');
 					}
 				});
-				const state = this.loadViewState(resourceUri);
+				const state = this.loadHTMLPreviewViewState(input);
 				this._scrollYPercentage = state ? state.scrollYPercentage : 0;
 				this.webview.baseUrl = resourceUri.toString(true);
 				this.webview.options = input.options;
@@ -252,34 +255,19 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		return this.getId() + '.editorViewState';
 	}
 
-	protected saveViewState(resource: URI | string, editorViewState: HtmlPreviewEditorViewState): void {
-		const memento = this.getMemento(this._storageService, Scope.WORKSPACE);
-		let editorViewStateMemento: { [key: string]: { [position: number]: HtmlPreviewEditorViewState } } = memento[this.viewStateStorageKey];
-		if (!editorViewStateMemento) {
-			editorViewStateMemento = Object.create(null);
-			memento[this.viewStateStorageKey] = editorViewStateMemento;
-		}
-
-		let fileViewState = editorViewStateMemento[resource.toString()];
-		if (!fileViewState) {
-			fileViewState = Object.create(null);
-			editorViewStateMemento[resource.toString()] = fileViewState;
-		}
-
-		if (typeof this.position === 'number') {
-			fileViewState[this.position] = editorViewState;
-		}
+	private saveHTMLPreviewViewState(input: HtmlInput, editorViewState: HtmlPreviewEditorViewState): void {
+		this.editorViewStateMemento.saveState(input, this.position, editorViewState);
 	}
 
-	protected loadViewState(resource: URI | string): HtmlPreviewEditorViewState | null {
-		const memento = this.getMemento(this._storageService, Scope.WORKSPACE);
-		const editorViewStateMemento: { [key: string]: { [position: number]: HtmlPreviewEditorViewState } } = memento[this.viewStateStorageKey];
-		if (editorViewStateMemento) {
-			const fileViewState = editorViewStateMemento[resource.toString()];
-			if (fileViewState) {
-				return fileViewState[this.position];
-			}
-		}
-		return null;
+	private loadHTMLPreviewViewState(input: HtmlInput): HtmlPreviewEditorViewState {
+		return this.editorViewStateMemento.loadState(input, this.position);
+	}
+
+	protected saveMemento(): void {
+
+		// ensure to first save our view state memento
+		this.editorViewStateMemento.save();
+
+		super.saveMemento();
 	}
 }
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index 5e1223341a8..b89a6530b6c 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -12,7 +12,7 @@ import * as strings from 'vs/base/common/strings';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { EditorOptions } from 'vs/workbench/common/editor';
+import { EditorOptions, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
@@ -55,12 +55,6 @@ interface IWalkThroughEditorViewState {
 	viewState: IViewState;
 }
 
-interface IWalkThroughEditorViewStates {
-	0?: IWalkThroughEditorViewState;
-	1?: IWalkThroughEditorViewState;
-	2?: IWalkThroughEditorViewState;
-}
-
 class WalkThroughCodeEditor extends CodeEditor {
 
 	constructor(
@@ -91,6 +85,7 @@ export class WalkThroughPart extends BaseEditor {
 	private scrollbar: DomScrollableElement;
 	private editorFocus: IContextKey<boolean>;
 	private size: Dimension;
+	private editorViewStateMemento: EditorViewStateMemento<IWalkThroughEditorViewState>;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -99,13 +94,14 @@ export class WalkThroughPart extends BaseEditor {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IOpenerService private openerService: IOpenerService,
 		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService,
+		@IStorageService storageService: IStorageService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@INotificationService private notificationService: INotificationService
 	) {
 		super(WalkThroughPart.ID, telemetryService, themeService);
 		this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService);
+		this.editorViewStateMemento = new EditorViewStateMemento<IWalkThroughEditorViewState>(this.getMemento(storageService, Scope.WORKSPACE), WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 	}
 
 	createEditor(container: HTMLElement): void {
@@ -279,7 +275,7 @@ export class WalkThroughPart extends BaseEditor {
 		}
 
 		if (this.input instanceof WalkThroughInput) {
-			this.saveTextEditorViewState(this.input.getResource());
+			this.saveTextEditorViewState(this.input);
 		}
 
 		this.contentDisposables = dispose(this.contentDisposables);
@@ -300,7 +296,7 @@ export class WalkThroughPart extends BaseEditor {
 						input.onReady(this.content.firstElementChild as HTMLElement);
 					}
 					this.scrollbar.scanDomNode();
-					this.loadTextEditorViewState(input.getResource());
+					this.loadTextEditorViewState(input);
 					this.updatedScrollPosition();
 					return;
 				}
@@ -430,7 +426,7 @@ export class WalkThroughPart extends BaseEditor {
 					input.onReady(innerContent);
 				}
 				this.scrollbar.scanDomNode();
-				this.loadTextEditorViewState(input.getResource());
+				this.loadTextEditorViewState(input);
 				this.updatedScrollPosition();
 			});
 	}
@@ -494,61 +490,46 @@ export class WalkThroughPart extends BaseEditor {
 		});
 	}
 
-	private saveTextEditorViewState(resource: URI): void {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		let editorViewStateMemento: { [key: string]: { [position: number]: IWalkThroughEditorViewState } } = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (!editorViewStateMemento) {
-			editorViewStateMemento = Object.create(null);
-			memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY] = editorViewStateMemento;
-		}
-
+	private saveTextEditorViewState(input: WalkThroughInput): void {
 		const scrollPosition = this.scrollbar.getScrollPosition();
-		const editorViewState: IWalkThroughEditorViewState = {
+
+		this.editorViewStateMemento.saveState(input, this.position, {
 			viewState: {
 				scrollTop: scrollPosition.scrollTop,
 				scrollLeft: scrollPosition.scrollLeft
 			}
-		};
-
-		let fileViewState = editorViewStateMemento[resource.toString()];
-		if (!fileViewState) {
-			fileViewState = Object.create(null);
-			editorViewStateMemento[resource.toString()] = fileViewState;
-		}
-
-		if (typeof this.position === 'number') {
-			fileViewState[this.position] = editorViewState;
-		}
+		});
 	}
 
-	private loadTextEditorViewState(resource: URI) {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		const editorViewStateMemento: { [key: string]: IWalkThroughEditorViewStates } = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (editorViewStateMemento) {
-			const fileViewState = editorViewStateMemento[resource.toString()];
-			if (fileViewState) {
-				const state = fileViewState[this.position];
-				if (state) {
-					this.scrollbar.setScrollPosition(state.viewState);
-				}
-			}
+	private loadTextEditorViewState(input: WalkThroughInput) {
+		const state = this.editorViewStateMemento.loadState(input, this.position);
+		if (state) {
+			this.scrollbar.setScrollPosition(state.viewState);
 		}
 	}
 
 	public clearInput(): void {
 		if (this.input instanceof WalkThroughInput) {
-			this.saveTextEditorViewState(this.input.getResource());
+			this.saveTextEditorViewState(this.input);
 		}
 		super.clearInput();
 	}
 
 	public shutdown(): void {
 		if (this.input instanceof WalkThroughInput) {
-			this.saveTextEditorViewState(this.input.getResource());
+			this.saveTextEditorViewState(this.input);
 		}
 		super.shutdown();
 	}
 
+	protected saveMemento(): void {
+
+		// ensure to first save our view state memento
+		this.editorViewStateMemento.save();
+
+		super.saveMemento();
+	}
+
 	dispose(): void {
 		this.editorFocus.reset();
 		this.contentDisposables = dispose(this.contentDisposables);
diff --git a/src/vs/workbench/test/common/editor/editor.test.ts b/src/vs/workbench/test/common/editor/editor.test.ts
index 218ff420427..fcfba8f9799 100644
--- a/src/vs/workbench/test/common/editor/editor.test.ts
+++ b/src/vs/workbench/test/common/editor/editor.test.ts
@@ -7,9 +7,9 @@
 
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { EditorInput, toResource } from 'vs/workbench/common/editor';
+import { EditorInput, toResource, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { IEditorModel } from 'vs/platform/editor/common/editor';
+import { IEditorModel, Position } from 'vs/platform/editor/common/editor';
 import URI from 'vs/base/common/uri';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -86,4 +86,129 @@ suite('Workbench - Editor', () => {
 		assert.equal(toResource(file, { supportSideBySide: true, filter: Schemas.file }).toString(), file.getResource().toString());
 		assert.equal(toResource(file, { supportSideBySide: true, filter: [Schemas.file, Schemas.untitled] }).toString(), file.getResource().toString());
 	});
+
+	test('EditorViewStateMemento - basics', function () {
+		interface TestViewState {
+			line: number;
+		}
+
+		const rawMemento = Object.create(null);
+		let memento = new EditorViewStateMemento<TestViewState>(rawMemento, 'key', 3);
+
+		let res = memento.loadState(URI.file('/A'), Position.ONE);
+		assert.ok(!res);
+
+		memento.saveState(URI.file('/A'), Position.ONE, { line: 3 });
+		res = memento.loadState(URI.file('/A'), Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 3);
+
+		memento.saveState(URI.file('/A'), Position.TWO, { line: 5 });
+		res = memento.loadState(URI.file('/A'), Position.TWO);
+		assert.ok(res);
+		assert.equal(res.line, 5);
+
+		// Ensure capped at 3 elements
+		memento.saveState(URI.file('/B'), Position.ONE, { line: 1 });
+		memento.saveState(URI.file('/C'), Position.ONE, { line: 1 });
+		memento.saveState(URI.file('/D'), Position.ONE, { line: 1 });
+		memento.saveState(URI.file('/E'), Position.ONE, { line: 1 });
+
+		assert.ok(!memento.loadState(URI.file('/A'), Position.ONE));
+		assert.ok(!memento.loadState(URI.file('/B'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/C'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/D'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/E'), Position.ONE));
+
+		memento.save();
+
+		memento = new EditorViewStateMemento(rawMemento, 'key', 3);
+		assert.ok(memento.loadState(URI.file('/C'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/D'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/E'), Position.ONE));
+
+		memento.clearState(URI.file('/C'));
+		memento.clearState(URI.file('/E'));
+
+		assert.ok(!memento.loadState(URI.file('/C'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/D'), Position.ONE));
+		assert.ok(!memento.loadState(URI.file('/E'), Position.ONE));
+	});
+
+	test('EditorViewStateMemento - use with editor input', function () {
+		interface TestViewState {
+			line: number;
+		}
+
+		class TestEditorInput extends EditorInput {
+			constructor(private resource: URI, private id = 'testEditorInput') {
+				super();
+			}
+			public getTypeId() { return 'testEditorInput'; }
+			public resolve(): TPromise<IEditorModel> { return null; }
+
+			public matches(other: TestEditorInput): boolean {
+				return other && this.id === other.id && other instanceof TestEditorInput;
+			}
+
+			public getResource(): URI {
+				return this.resource;
+			}
+		}
+
+		const rawMemento = Object.create(null);
+		let memento = new EditorViewStateMemento<TestViewState>(rawMemento, 'key', 3);
+
+		const testInputA = new TestEditorInput(URI.file('/A'));
+
+		let res = memento.loadState(testInputA, Position.ONE);
+		assert.ok(!res);
+
+		memento.saveState(testInputA, Position.ONE, { line: 3 });
+		res = memento.loadState(testInputA, Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 3);
+
+		// State removed when input gets disposed
+		testInputA.dispose();
+		res = memento.loadState(testInputA, Position.ONE);
+		assert.ok(!res);
+	});
+
+	test('EditorViewStateMemento - migration', function () {
+		interface TestViewState {
+			line: number;
+		}
+
+		const rawMemento = {
+			'key': {
+				[URI.file('/A').toString()]: {
+					0: {
+						line: 5
+					}
+				},
+				[URI.file('/B').toString()]: {
+					0: {
+						line: 1
+					},
+					1: {
+						line: 2
+					}
+				}
+			}
+		};
+		let memento = new EditorViewStateMemento<TestViewState>(rawMemento, 'key', 3);
+
+		let res = memento.loadState(URI.file('/A'), Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 5);
+
+		res = memento.loadState(URI.file('/B'), Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 1);
+
+		res = memento.loadState(URI.file('/B'), Position.TWO);
+		assert.ok(res);
+		assert.equal(res.line, 2);
+	});
 });
\ No newline at end of file

From ed98cd4f8b944b1ea6fcdd4ad8aeeb6decf894b9 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 6 Apr 2018 07:46:11 +0200
Subject: [PATCH 370/383] settings - mark more as Scope.APPLICATION

---
 .../update/node/update.config.contribution.ts      |  1 +
 .../electron-browser/main.contribution.ts          | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/update/node/update.config.contribution.ts b/src/vs/platform/update/node/update.config.contribution.ts
index 2ec106013a0..755e519a36b 100644
--- a/src/vs/platform/update/node/update.config.contribution.ts
+++ b/src/vs/platform/update/node/update.config.contribution.ts
@@ -26,6 +26,7 @@ configurationRegistry.registerConfiguration({
 		'update.enableWindowsBackgroundUpdates': {
 			'type': 'boolean',
 			'default': true,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates.")
 		}
 	}
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 41611135c33..c57c28d3c1b 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -10,7 +10,7 @@ import * as nls from 'vs/nls';
 import product from 'vs/platform/node/product';
 import * as os from 'os';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
@@ -298,6 +298,7 @@ configurationRegistry.registerConfiguration({
 					nls.localize('window.openFilesInNewWindow.default', "Files will open in a new window unless picked from within the application (e.g. via the File menu)")
 			],
 			'default': 'off',
+			'scope': ConfigurationScope.APPLICATION,
 			'description':
 				isMacintosh ?
 					nls.localize('openFilesInNewWindowMac', "Controls if files should open in a new window.\n- default: files will open in the window with the files' folder open or the last active window unless opened via the Dock or from Finder\n- on: files will open in a new window\n- off: files will open in the window with the files' folder open or the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).") :
@@ -312,6 +313,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.openFoldersInNewWindow.default', "Folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)")
 			],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('openFoldersInNewWindow', "Controls if folders should open in a new window or replace the last active window.\n- default: folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)\n- on: folders will open in a new window\n- off: folders will replace the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
 		},
 		'window.openWithoutArgumentsInNewWindow': {
@@ -322,6 +324,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.openWithoutArgumentsInNewWindow.off', "Focus the last active running instance")
 			],
 			'default': isMacintosh ? 'off' : 'on',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('openWithoutArgumentsInNewWindow', "Controls if a new empty window should open when starting a second instance without arguments or if the last running instance should get focus.\n- on: open a new empty window\n- off: the last active running instance will get focus\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
 		},
 		'window.restoreWindows': {
@@ -334,11 +337,13 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.reopenFolders.none', "Never reopen a window. Always start with an empty one.")
 			],
 			'default': 'one',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('restoreWindows', "Controls how windows are being reopened after a restart. Select 'none' to always start with an empty workspace, 'one' to reopen the last window you worked on, 'folders' to reopen all windows that had folders opened or 'all' to reopen all windows of your last session.")
 		},
 		'window.restoreFullscreen': {
 			'type': 'boolean',
 			'default': false,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('restoreFullscreen', "Controls if a window should restore to full screen mode if it was exited in full screen mode.")
 		},
 		'window.zoomLevel': {
@@ -362,6 +367,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.newWindowDimensions.fullscreen', "Open new windows in full screen mode.")
 			],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('newWindowDimensions', "Controls the dimensions of opening a new window when at least one window is already opened. By default, a new window will open in the center of the screen with small dimensions. When set to 'inherit', the window will get the same dimensions as the last window that was active. When set to 'maximized', the window will open maximized and fullscreen if configured to 'fullscreen'. Note that this setting does not have an impact on the first window that is opened. The first window will always restore the size and location as you left it before closing.")
 		},
 		'window.closeWhenEmpty': {
@@ -379,12 +385,14 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.menuBarVisibility.hidden', "Menu is always hidden.")
 			],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('menuBarVisibility', "Control the visibility of the menu bar. A setting of 'toggle' means that the menu bar is hidden and a single press of the Alt key will show it. By default, the menu bar will be visible, unless the window is full screen."),
 			'included': isWindows || isLinux
 		},
 		'window.enableMenuBarMnemonics': {
 			'type': 'boolean',
 			'default': true,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('enableMenuBarMnemonics', "If enabled, the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."),
 			'included': isWindows || isLinux
 		},
@@ -398,24 +406,28 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'enum': ['native', 'custom'],
 			'default': 'custom',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. Changes require a full restart to apply."),
 			'included': isMacintosh
 		},
 		'window.nativeTabs': {
 			'type': 'boolean',
 			'default': false,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured."),
 			'included': isMacintosh && parseFloat(os.release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
 		},
 		'window.smoothScrollingWorkaround': {
 			'type': 'boolean',
 			'default': false,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('window.smoothScrollingWorkaround', "Enable this workaround if scrolling is no longer smooth after restoring a minimized VS Code window. This is a workaround for an issue (https://github.com/Microsoft/vscode/issues/13612) where scrolling starts to lag on devices with precision trackpads like the Surface devices from Microsoft. Enabling this workaround can result in a little bit of layout flickering after restoring the window from minimized state but is otherwise harmless."),
 			'included': isWindows
 		},
 		'window.clickThroughInactive': {
 			'type': 'boolean',
 			'default': true,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and trigger the element under the mouse if it is clickable. If disabled, clicking anywhere on an inactive window will activate it only and a second click is required on the element."),
 			'included': isMacintosh
 		}

From 6c139ab33340e6de8cb602a1c9c83dfaf045c580 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 20:22:01 -0700
Subject: [PATCH 371/383] Move all private properties together

---
 src/vs/workbench/api/node/extHostWebview.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 537c42e5107..df041a967e6 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -13,7 +13,9 @@ import { Disposable } from './extHostTypes';
 
 export class ExtHostWebview implements vscode.Webview {
 
+	private readonly _handle: WebviewHandle;
 	private readonly _viewType: string;
+	private readonly _proxy: MainThreadWebviewsShape;
 	private _title: string;
 	private _html: string;
 	private _options: vscode.WebviewOptions;
@@ -32,12 +34,14 @@ export class ExtHostWebview implements vscode.Webview {
 	public readonly onDidChangeViewState: Event<vscode.WebViewOnDidChangeViewStateEvent> = this.onDidChangeViewStateEmitter.event;
 
 	constructor(
-		private readonly _handle: WebviewHandle,
-		private readonly _proxy: MainThreadWebviewsShape,
+		handle: WebviewHandle,
+		proxy: MainThreadWebviewsShape,
 		viewType: string,
 		viewColumn: vscode.ViewColumn,
 		options: vscode.WebviewOptions
 	) {
+		this._handle = handle;
+		this._proxy = proxy;
 		this._viewType = viewType;
 		this._viewColumn = viewColumn;
 		this._options = options;

From 75ecc5ef29e587f4f49bd95c6beea2def25c81b2 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 20:22:20 -0700
Subject: [PATCH 372/383] Delete now unused webview.state

---
 src/vs/workbench/api/node/extHostWebview.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index df041a967e6..a6149d50acc 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -22,7 +22,6 @@ export class ExtHostWebview implements vscode.Webview {
 	private _isDisposed: boolean = false;
 	private _viewColumn: vscode.ViewColumn;
 	private _active: boolean;
-	private _state: any;
 
 	public readonly onMessageEmitter = new Emitter<any>();
 	public readonly onDidReceiveMessage: Event<any> = this.onMessageEmitter.event;
@@ -91,11 +90,6 @@ export class ExtHostWebview implements vscode.Webview {
 		}
 	}
 
-	get state(): any {
-		this.assertNotDisposed();
-		return this._state;
-	}
-
 	get options(): vscode.WebviewOptions {
 		this.assertNotDisposed();
 		return this._options;

From 8f48d8f839a996cd7791e5608c6607b4e2749028 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 20:41:33 -0700
Subject: [PATCH 373/383] Add test for registering duplicate webview serialiers

---
 .../api/extHostWebview.test.ts                | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts

diff --git a/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts b/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts
new file mode 100644
index 00000000000..d4bb00a2bc4
--- /dev/null
+++ b/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { MainThreadWebviews } from 'vs/workbench/api/electron-browser/mainThreadWebview';
+import { ExtHostWebviews } from 'vs/workbench/api/node/extHostWebview';
+import { mock } from 'vs/workbench/test/electron-browser/api/mock';
+import * as vscode from 'vscode';
+import { SingleProxyRPCProtocol } from './testRPCProtocol';
+import { Position as EditorPosition } from 'vs/platform/editor/common/editor';
+
+suite('ExtHostWebview', function () {
+
+	test('Cannot register multiple serializer for the same view type', async () => {
+		const viewType = 'view.type';
+
+		const shape = createNoopMainThreadWebviews();
+		const extHostWebviews = new ExtHostWebviews(SingleProxyRPCProtocol(shape));
+
+		let lastInvokedDeserializer: vscode.WebviewSerializer | undefined = undefined;
+
+		class NoopSerializer implements vscode.WebviewSerializer {
+			async serializeWebview(webview: vscode.Webview): Promise<any> { /* noop */ }
+
+			async deserializeWebview(webview: vscode.Webview, state: any): Promise<void> {
+				lastInvokedDeserializer = this;
+			}
+		}
+
+		const serializerA = new NoopSerializer();
+		const serializerB = new NoopSerializer();
+
+		const serializerARegistration = extHostWebviews.registerWebviewSerializer(viewType, serializerA);
+
+		await extHostWebviews.$deserializeWebview('x', viewType, {}, EditorPosition.ONE, {});
+		assert.strictEqual(lastInvokedDeserializer, serializerA);
+
+		assert.throws(
+			() => extHostWebviews.registerWebviewSerializer(viewType, serializerB),
+			'Should throw when registering two serializers for the same view');
+
+		serializerARegistration.dispose();
+
+		extHostWebviews.registerWebviewSerializer(viewType, serializerB);
+
+		await extHostWebviews.$deserializeWebview('x', viewType, {}, EditorPosition.ONE, {});
+		assert.strictEqual(lastInvokedDeserializer, serializerB);
+	});
+});
+
+
+function createNoopMainThreadWebviews() {
+	return new class extends mock<MainThreadWebviews>() {
+		$registerSerializer() { /* noop */ }
+		$unregisterSerializer() { /* noop */ }
+	};
+}
+

From 0183f9304b00372389b6e989187ffd82115e9a93 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 23:13:53 -0700
Subject: [PATCH 374/383] Fixing error message

---
 .../parts/webview/electron-browser/webviewEditorService.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
index 4d8b81c9872..21c10166647 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -142,7 +142,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 		reviver: WebviewReviver
 	): IDisposable {
 		if (this._revivers.has(viewType)) {
-			throw new Error(`Reveriver for 'viewType' already registered`);
+			throw new Error(`Reveriver for '${viewType}' already registered`);
 		}
 
 		this._revivers.set(viewType, reviver);

From 529199604d8796e78ab7c49c48293a96a9f202ba Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 23:33:21 -0700
Subject: [PATCH 375/383] Fix spelling

---
 .../parts/webview/electron-browser/webviewEditorService.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
index 21c10166647..b50b46b1194 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -142,7 +142,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 		reviver: WebviewReviver
 	): IDisposable {
 		if (this._revivers.has(viewType)) {
-			throw new Error(`Reveriver for '${viewType}' already registered`);
+			throw new Error(`Reviver for '${viewType}' already registered`);
 		}
 
 		this._revivers.set(viewType, reviver);

From 00cc78d7bd9fc144933ce26bb1081d635e1a2f70 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 23:34:10 -0700
Subject: [PATCH 376/383] Properly await on revive

---
 .../parts/webview/electron-browser/webviewEditorService.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
index b50b46b1194..806b9f9640b 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -148,7 +148,6 @@ export class WebviewEditorService implements IWebviewEditorService {
 		this._revivers.set(viewType, reviver);
 
 		// Resolve any pending views
-
 		const toRevive = this._awaitingRevival.filter(x => x.input.viewType === viewType);
 		this._awaitingRevival = this._awaitingRevival.filter(x => x.input.viewType !== viewType);
 
@@ -168,15 +167,15 @@ export class WebviewEditorService implements IWebviewEditorService {
 		return this._revivers.has(viewType) && this._revivers.get(viewType).canRevive(webview);
 	}
 
-	tryRevive(
+	private async tryRevive(
 		webview: WebviewEditorInput
-	): boolean {
+	): TPromise<boolean> {
 		const reviver = this._revivers.get(webview.viewType);
 		if (!reviver) {
 			return false;
 		}
 
-		reviver.reviveWebview(webview);
+		await reviver.reviveWebview(webview);
 		return true;
 	}
 }
\ No newline at end of file

From 7307023e1d85ffafa430b24e19b0a5370f0792a7 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 23:43:49 -0700
Subject: [PATCH 377/383] Rename webviewInput to webviewEditorInput

---
 .../workbench/api/electron-browser/mainThreadWebview.ts   | 2 +-
 .../parts/update/electron-browser/releaseNotesEditor.ts   | 2 +-
 .../webview/electron-browser/webview.contribution.ts      | 8 ++++----
 .../parts/webview/electron-browser/webviewEditor.ts       | 2 +-
 .../{webviewInput.ts => webviewEditorInput.ts}            | 0
 ...ebviewInputFactory.ts => webviewEditorInputFactory.ts} | 4 ++--
 .../webview/electron-browser/webviewEditorService.ts      | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename src/vs/workbench/parts/webview/electron-browser/{webviewInput.ts => webviewEditorInput.ts} (100%)
 rename src/vs/workbench/parts/webview/electron-browser/{webviewInputFactory.ts => webviewEditorInputFactory.ts} (93%)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 6bfdd804647..8e6bbf70df3 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -13,7 +13,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewHandle } from 'vs/workbench/api/node/extHost.protocol';
 import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor';
-import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
 import { IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index cb6672257ae..30e519743fc 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -27,7 +27,7 @@ import { IWebviewEditorService } from 'vs/workbench/parts/webview/electron-brows
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { Position } from 'vs/platform/editor/common/editor';
-import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
 
 function renderBody(
 	body: string,
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
index ec1e97a3fc8..63f62ee1359 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
@@ -13,12 +13,12 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
-import { WebviewInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewInputFactory';
+import { WebviewEditorInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory';
 import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
 import { HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindTermCommand, ShowWebViewEditorFindWidgetCommand } from './webviewCommands';
 import { WebviewEditor } from './webviewEditor';
 import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService';
-import { WebviewEditorInput } from './webviewInput';
+import { WebviewEditorInput } from './webviewEditorInput';
 
 (Registry.as<IEditorRegistry>(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(
 	WebviewEditor,
@@ -27,8 +27,8 @@ import { WebviewEditorInput } from './webviewInput';
 	[new SyncDescriptor(WebviewEditorInput)]);
 
 Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).registerEditorInputFactory(
-	WebviewInputFactory.ID,
-	WebviewInputFactory);
+	WebviewEditorInputFactory.ID,
+	WebviewEditorInputFactory);
 
 registerSingleton(IWebviewEditorService, WebviewEditorService);
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index f7e00e4c9bb..c7fba7cb817 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -18,7 +18,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import * as DOM from 'vs/base/browser/dom';
 import { Event, Emitter } from 'vs/base/common/event';
-import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
 import URI from 'vs/base/common/uri';
 
 export class WebviewEditor extends BaseWebviewEditor {
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
similarity index 100%
rename from src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
similarity index 93%
rename from src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
index a19662206fe..3984cbd11d3 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
@@ -8,7 +8,7 @@
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorInputFactory } from 'vs/workbench/common/editor';
 import { IWebviewEditorService, WebviewInputOptions } from './webviewEditorService';
-import { WebviewEditorInput } from './webviewInput';
+import { WebviewEditorInput } from './webviewEditorInput';
 
 interface SerializedWebview {
 	readonly viewType: string;
@@ -18,7 +18,7 @@ interface SerializedWebview {
 	readonly state: any;
 }
 
-export class WebviewInputFactory implements IEditorInputFactory {
+export class WebviewEditorInputFactory implements IEditorInputFactory {
 
 	public static readonly ID = WebviewEditorInput.typeId;
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
index 806b9f9640b..8a4bac0a396 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -9,7 +9,7 @@ import { IInstantiationService, createDecorator } from 'vs/platform/instantiatio
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import * as vscode from 'vscode';
-import { WebviewEditorInput } from './webviewInput';
+import { WebviewEditorInput } from './webviewEditorInput';
 import { TPromise } from 'vs/base/common/winjs.base';
 
 export const IWebviewEditorService = createDecorator<IWebviewEditorService>('webviewEditorService');

From 78707964d003fe547f0b765863d27a2cf21572aa Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 6 Apr 2018 00:15:07 -0700
Subject: [PATCH 378/383] Reduce duplicate state for active webviews

---
 .../api/electron-browser/mainThreadWebview.ts | 28 ++++++++-----
 src/vs/workbench/api/node/extHost.protocol.ts |  3 +-
 src/vs/workbench/api/node/extHostWebview.ts   | 39 ++++---------------
 .../electron-browser/webviewEditorInput.ts    |  4 --
 4 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 8e6bbf70df3..0bf8ddedefa 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -37,7 +37,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 	private readonly _webviews = new Map<WebviewHandle, WebviewEditorInput>();
 	private readonly _revivers = new Set<string>();
 
-	private _activeWebview: WebviewEditorInput | undefined = undefined;
+	private _activeWebview: WebviewHandle | undefined = undefined;
 
 	constructor(
 		context: IExtHostContext,
@@ -175,7 +175,6 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		return {
 			onDidClickLink: uri => this.onDidClickLink(handle, uri),
 			onMessage: message => this._proxy.$onMessage(handle, message),
-			onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
 			onDispose: () => {
 				this._proxy.$onDidDisposeWeview(handle).then(() => {
 					this._webviews.delete(handle);
@@ -205,16 +204,25 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			}
 		}
 
+		if (newActiveWebview && newActiveWebview.handle === this._activeWebview) {
+			// No change
+			return;
+		}
+
+		// Broadcast view state update for currently active
+		if (typeof this._activeWebview !== 'undefined') {
+			const oldActiveWebview = this._webviews.get(this._activeWebview);
+			if (oldActiveWebview) {
+				this._proxy.$onDidChangeWeviewViewState(this._activeWebview, false, oldActiveWebview.position);
+			}
+		}
+
+		// Then for newly active
 		if (newActiveWebview) {
-			if (!this._activeWebview || newActiveWebview.input !== this._activeWebview) {
-				this._proxy.$onDidChangeActiveWeview(newActiveWebview.handle);
-				this._activeWebview = newActiveWebview.input;
-			}
+			this._proxy.$onDidChangeWeviewViewState(newActiveWebview.handle, true, activeEditor.position);
+			this._activeWebview = newActiveWebview.handle;
 		} else {
-			if (this._activeWebview) {
-				this._proxy.$onDidChangeActiveWeview(undefined);
-				this._activeWebview = undefined;
-			}
+			this._activeWebview = undefined;
 		}
 	}
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 3e8c56318dc..aa980077368 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -363,9 +363,8 @@ export interface MainThreadWebviewsShape extends IDisposable {
 
 export interface ExtHostWebviewsShape {
 	$onMessage(handle: WebviewHandle, message: any): void;
-	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void;
+	$onDidChangeWeviewViewState(handle: WebviewHandle, active: boolean, position: EditorPosition): void;
 	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void>;
-	$onDidChangePosition(handle: WebviewHandle, newPosition: EditorPosition): void;
 	$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): Thenable<void>;
 	$serializeWebview(webviewHandle: WebviewHandle): Thenable<any>;
 }
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index a6149d50acc..b947841462d 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -140,8 +140,6 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 	private readonly _webviews = new Map<WebviewHandle, ExtHostWebview>();
 	private readonly _serializers = new Map<string, vscode.WebviewSerializer>();
 
-	private _activeWebview: ExtHostWebview | undefined;
-
 	constructor(
 		mainContext: IMainContext
 	) {
@@ -187,21 +185,14 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		}
 	}
 
-	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void {
-		if (handle) {
-			const webview = this.getWebview(handle);
-			if (webview) {
-				if (webview !== this._activeWebview) {
-					this._activeWebview = webview;
-					webview.active = true;
-					webview.onDidChangeViewStateEmitter.fire({ viewColumn: webview.viewColumn, active: true });
-				}
-			}
-		} else {
-			if (this._activeWebview) {
-				this._activeWebview.active = false;
-				this._activeWebview.onDidChangeViewStateEmitter.fire({ viewColumn: this._activeWebview.viewColumn, active: false });
-				this._activeWebview = undefined;
+	$onDidChangeWeviewViewState(handle: WebviewHandle, active: boolean, position: Position): void {
+		const webview = this.getWebview(handle);
+		if (webview) {
+			const viewColumn = typeConverters.toViewColumn(position);
+			if (webview.active !== active || webview.viewColumn !== viewColumn) {
+				webview.active = active;
+				webview.viewColumn = viewColumn;
+				webview.onDidChangeViewStateEmitter.fire({ active, viewColumn });
 			}
 		}
 	}
@@ -211,24 +202,10 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		if (webview) {
 			webview.onDisposeEmitter.fire();
 			this._webviews.delete(handle);
-			if (this._activeWebview === webview) {
-				this._activeWebview = undefined;
-			}
 		}
 		return TPromise.as(void 0);
 	}
 
-	$onDidChangePosition(handle: WebviewHandle, newPosition: Position): void {
-		const webview = this.getWebview(handle);
-		if (webview) {
-			const newViewColumn = typeConverters.toViewColumn(newPosition);
-			if (webview.viewColumn !== newViewColumn) {
-				webview.viewColumn = newViewColumn;
-				webview.onDidChangeViewStateEmitter.fire({ viewColumn: newViewColumn, active: webview.active });
-			}
-		}
-	}
-
 	$deserializeWebview(
 		webviewHandle: WebviewHandle,
 		viewType: string,
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
index 18b09dac459..3cd1faf584d 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
@@ -228,9 +228,5 @@ export class WebviewEditorInput extends EditorInput {
 
 	public onBecameActive(position: Position): void {
 		this._position = position;
-
-		if (this._events && this._events.onDidChangePosition) {
-			this._events.onDidChangePosition(position);
-		}
 	}
 }

From 5a0ead58d87fb564190f078f065e118b0ca89f24 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 6 Apr 2018 00:20:33 -0700
Subject: [PATCH 379/383] Make sure we don't try posting mesages to disposed
 markdown previews

Fixes #45553
---
 .../src/features/preview.ts                     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
index 8a357a2ff68..37a21b493fa 100644
--- a/extensions/markdown-language-features/src/features/preview.ts
+++ b/extensions/markdown-language-features/src/features/preview.ts
@@ -28,6 +28,8 @@ export class MarkdownPreview {
 	private currentVersion?: { resource: vscode.Uri, version: number };
 	private forceUpdate = false;
 	private isScrolling = false;
+	private _disposed: boolean = false;
+
 
 	public static async revive(
 		webview: vscode.Webview,
@@ -141,7 +143,7 @@ export class MarkdownPreview {
 
 		vscode.window.onDidChangeTextEditorSelection(event => {
 			if (this.isPreviewOf(event.textEditor.document.uri)) {
-				this.webview.postMessage({
+				this.postMessage({
 					type: 'onDidChangeTextEditorSelection',
 					line: event.selections[0].active.line,
 					source: this.resource.toString()
@@ -169,6 +171,11 @@ export class MarkdownPreview {
 	}
 
 	public dispose() {
+		if (this._disposed) {
+			return;
+		}
+
+		this._disposed = true;
 		this._onDisposeEmitter.fire();
 
 		this._onDisposeEmitter.dispose();
@@ -276,7 +283,7 @@ export class MarkdownPreview {
 		if (typeof topLine === 'number') {
 			this.logger.log('updateForView', { markdownFile: resource });
 			this.line = topLine;
-			this.webview.postMessage({
+			this.postMessage({
 				type: 'updateView',
 				line: topLine,
 				source: resource.toString()
@@ -284,6 +291,12 @@ export class MarkdownPreview {
 		}
 	}
 
+	private postMessage(msg: any) {
+		if (!this._disposed) {
+			this.webview.postMessage(msg);
+		}
+	}
+
 	private async doUpdate(): Promise<void> {
 		const resource = this._resource;
 

From d7e0604ec6273e89de057e99064e4acc1fd249a4 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Apr 2018 17:28:36 -0700
Subject: [PATCH 380/383] Prototype webview widget

Start prototyping a webview widget. Code is still super rough
---
 .../markdown-language-features/package.json   |   5 +
 .../src/extension.ts                          |   8 ++
 src/vs/vscode.proposed.d.ts                   |   2 +
 .../api/electron-browser/mainThreadWebview.ts |  50 ++++++---
 src/vs/workbench/api/node/extHost.api.impl.ts |   3 +
 src/vs/workbench/api/node/extHost.protocol.ts |   2 +
 src/vs/workbench/api/node/extHostWebview.ts   |  12 +-
 .../electron-browser/webviewElement.ts        |   4 +
 .../webview/electron-browser/webviewWidget.ts | 106 ++++++++++++++++++
 9 files changed, 178 insertions(+), 14 deletions(-)
 create mode 100644 src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts

diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 6fa682e351d..9ea81491be4 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -27,6 +27,11 @@
 	],
 	"contributes": {
 		"commands": [
+			{
+				"command": "unicorn",
+				"title": "🦄 unicorn",
+				"category": "Markdown"
+			},
 			{
 				"command": "markdown.showPreview",
 				"title": "%markdown.preview.title%",
diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index 53e0c6286e1..536a12d9f57 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -59,4 +59,12 @@ export function activate(context: vscode.ExtensionContext) {
 		logger.updateConfiguration();
 		previewManager.updateConfiguration();
 	}));
+
+	vscode.commands.registerCommand('unicorn', () => {
+		if (vscode.window.activeTextEditor) {
+			vscode.window.showWebviewWidget(vscode.window.activeTextEditor, vscode.window.activeTextEditor.selection.active, 'unicorn', 'Webview', {}).then(webview => {
+				webview.html = '<img src="https://media.giphy.com/media/JIX9t2j0ZTN9S/giphy.gif"/>';
+			});
+		}
+	});
 }
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index f61737f5919..088c3616e2d 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -685,6 +685,8 @@ declare module 'vscode' {
 		 * @param reviver Webview serializer.
 		 */
 		export function registerWebviewSerializer(viewType: string, reviver: WebviewSerializer): Disposable;
+
+		export function showWebviewWidget(editor: TextEditor, position: Position, viewType: string, title: string, options: WebviewOptions): Thenable<Webview>;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 0bf8ddedefa..04052285280 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -18,7 +18,10 @@ import { IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/w
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { ICodeEditor } from '../../../editor/browser/editorBrowser';
+import { EDITOR_CONTRIBUTION_ID, WebviewWidgetContribution } from '../../parts/webview/electron-browser/webviewWidget';
 import { extHostNamedCustomer } from './extHostCustomers';
+import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
 
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
 export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviver {
@@ -34,7 +37,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 	private _toDispose: IDisposable[] = [];
 
 	private readonly _proxy: ExtHostWebviewsShape;
-	private readonly _webviews = new Map<WebviewHandle, WebviewEditorInput>();
+	private readonly _webviewInputs = new Map<WebviewHandle, WebviewEditorInput>();
+	private readonly _webviews = new Map<WebviewHandle, WebviewElement>();
 	private readonly _revivers = new Set<string>();
 
 	private _activeWebview: WebviewHandle | undefined = undefined;
@@ -77,7 +81,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			state: undefined
 		};
 
-		this._webviews.set(handle, webview);
+		this._webviewInputs.set(handle, webview);
 	}
 
 	$disposeWebview(handle: WebviewHandle): void {
@@ -92,7 +96,14 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 
 	$setHtml(handle: WebviewHandle, value: string): void {
 		const webview = this.getWebview(handle);
-		webview.html = value;
+		if (webview) {
+			webview.html = value;
+		} else {
+			const webview = this._webviews.get(handle);
+			if (webview) {
+				webview.contents = value;
+			}
+		}
 	}
 
 	$reveal(handle: WebviewHandle, column: Position): void {
@@ -122,11 +133,24 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		this._revivers.delete(viewType);
 	}
 
+	$showWebviewWidget(handle: WebviewHandle, editorId: string, lineNumber: number, viewType: string, options: WebviewInputOptions): void {
+		const editor = this._editorService.getActiveEditor();
+		if (editor && editor.getControl()) {
+			(editor.getControl() as ICodeEditor).getContribution<WebviewWidgetContribution>(EDITOR_CONTRIBUTION_ID).showWebviewWidget(lineNumber, 0, webview => {
+				this._webviews.set(handle, webview);
+				webview.onDidClickLink(uri => this.onDidClickLink(uri, webview.options));
+				webview.onMessage(message => this._proxy.$onMessage(handle, message));
+			});
+		}
+
+		return undefined;
+	}
+
 	reviveWebview(webview: WebviewEditorInput): TPromise<void> {
 		const viewType = webview.state.viewType;
 		return this._extensionService.activateByEvent(`onView:${viewType}`).then(() => {
 			const handle = 'revival-' + MainThreadWebviews.revivalPool++;
-			this._webviews.set(handle, webview);
+			this._webviewInputs.set(handle, webview);
 			webview._events = this.createWebviewEventDelegate(handle);
 
 			return this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options)
@@ -142,7 +166,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 
 	private _onWillShutdown(): TPromise<boolean> {
 		const toRevive: WebviewHandle[] = [];
-		this._webviews.forEach((view, key) => {
+		this._webviewInputs.forEach((view, key) => {
 			if (this.canRevive(view)) {
 				toRevive.push(key);
 			}
@@ -158,7 +182,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 
 		return TPromise.join(reviveResponses).then(results => {
 			for (const result of results) {
-				const view = this._webviews.get(result.handle);
+				const view = this._webviewInputs.get(result.handle);
 				if (view) {
 					if (result.state) {
 						view.state.state = result.state;
@@ -184,10 +208,10 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 	}
 
 	private getWebview(handle: WebviewHandle): WebviewEditorInput {
-		const webview = this._webviews.get(handle);
-		if (!webview) {
-			throw new Error('Unknown webview handle:' + handle);
-		}
+		const webview = this._webviewInputs.get(handle);
+		// if (!webview) {
+		// 	throw new Error('Unknown webview handle:' + handle);
+		// }
 		return webview;
 	}
 
@@ -195,8 +219,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		const activeEditor = this._editorService.getActiveEditor();
 		let newActiveWebview: { input: WebviewEditorInput, handle: WebviewHandle } | undefined = undefined;
 		if (activeEditor && activeEditor.input instanceof WebviewEditorInput) {
-			for (const handle of map.keys(this._webviews)) {
-				const input = this._webviews.get(handle);
+			for (const handle of map.keys(this._webviewInputs)) {
+				const input = this._webviewInputs.get(handle);
 				if (input.matches(activeEditor.input)) {
 					newActiveWebview = { input, handle };
 					break;
@@ -211,7 +235,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 
 		// Broadcast view state update for currently active
 		if (typeof this._activeWebview !== 'undefined') {
-			const oldActiveWebview = this._webviews.get(this._activeWebview);
+			const oldActiveWebview = this._webviewInputs.get(this._activeWebview);
 			if (oldActiveWebview) {
 				this._proxy.$onDidChangeWeviewViewState(this._activeWebview, false, oldActiveWebview.position);
 			}
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 6757325af76..80e479583b5 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -421,6 +421,9 @@ export function createApiFactory(
 			}),
 			registerWebviewSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewSerializer) => {
 				return extHostWebviews.registerWebviewSerializer(viewType, serializer);
+			}),
+			showWebviewWidget: proposedApiFunction(extension, (editor: vscode.TextEditor, position: vscode.Position, viewType: string, title: string, options: vscode.WebviewOptions) => {
+				return extHostWebviews.showWebviewWidget(editor, position.line, viewType, title, options);
 			})
 		};
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index aa980077368..8529238873c 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -359,6 +359,8 @@ export interface MainThreadWebviewsShape extends IDisposable {
 
 	$registerSerializer(viewType: string): void;
 	$unregisterSerializer(viewType: string): void;
+
+	$showWebviewWidget(handle: WebviewHandle, editorId: string, lineNumber: number, viewType: string, options: vscode.WebviewOptions): void;
 }
 
 export interface ExtHostWebviewsShape {
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index b947841462d..5746e13bb29 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -10,6 +10,7 @@ import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import { Position } from 'vs/platform/editor/common/editor';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable } from './extHostTypes';
+import { ExtHostTextEditor } from './extHostTextEditor';
 
 export class ExtHostWebview implements vscode.Webview {
 
@@ -141,7 +142,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 	private readonly _serializers = new Map<string, vscode.WebviewSerializer>();
 
 	constructor(
-		mainContext: IMainContext
+		mainContext: IMainContext,
 	) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadWebviews);
 	}
@@ -178,6 +179,15 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		});
 	}
 
+	async showWebviewWidget(editor: vscode.TextEditor, lineNumber: number, viewType: string, title: string, options: vscode.WebviewOptions) {
+		const handle = ExtHostWebviews.webviewHandlePool++ + '';
+		this._proxy.$showWebviewWidget(handle, (editor as ExtHostTextEditor).id, lineNumber, viewType, options);
+
+		const webview = new ExtHostWebview(handle, this._proxy, viewType, undefined, options);
+		this._webviews.set(handle, webview);
+		return webview;
+	}
+
 	$onMessage(handle: WebviewHandle, message: any): void {
 		const webview = this.getWebview(handle);
 		if (webview) {
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
index 0ea8ed3965e..9e9ccc1d6dc 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
@@ -184,6 +184,10 @@ export class WebviewElement {
 		parent.appendChild(this._webview);
 	}
 
+	public getDomNode() {
+		return this._webview;
+	}
+
 	public notifyFindWidgetFocusChanged(isFocused: boolean) {
 		this._contextKey.set(isFocused || document.activeElement === this._webview);
 	}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts b/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
new file mode 100644
index 00000000000..78e33ac2a0f
--- /dev/null
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
+import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation';
+import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
+
+export const EDITOR_CONTRIBUTION_ID = 'editor.contrib.webview';
+
+export class WebviewWidget extends ZoneWidget {
+
+	private _webview: WebviewElement;
+
+	constructor(
+		editor: ICodeEditor,
+		private readonly _delegate: (view: WebviewElement) => void,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IPartService private readonly _partService: IPartService,
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService
+	) {
+		super(editor, {});
+
+		// this._applyTheme(_themeService.getTheme());
+		// this._callOnDispose.push(_themeService.onThemeChange(this._applyTheme.bind(this)));
+
+		this.create();
+	}
+
+	protected _fillContainer(container: HTMLElement): void {
+		this._webview = new WebviewElement(
+			this._partService.getContainer(Parts.EDITOR_PART),
+			this._themeService,
+			this._environmentService,
+			this._contextViewService,
+			undefined,
+			undefined,
+			{
+				enableWrappedPostMessage: true,
+				useSameOriginForRoot: false
+			});
+		this._webview.mountTo(container);
+
+		const e = new DomScrollableElement(this._webview.getDomNode(), {});
+		e.getDomNode().style.width = '100%';
+		e.getDomNode().style.height = '100%';
+		container.appendChild(e.getDomNode());
+		this._delegate(this._webview);
+	}
+}
+
+export interface IWebviewWidgetContribution extends IEditorContribution {
+	showWebviewWidget(lineNumber: number, column: number, delegate: (view: WebviewElement) => void): void;
+	closeWebviewWidget(): void;
+}
+
+
+export class WebviewWidgetContribution implements IWebviewWidgetContribution {
+	private _webviewWidget: WebviewWidget;
+
+	constructor(
+		private editor: ICodeEditor,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
+	) { }
+
+	showWebviewWidget(lineNumber: number, column: number, delegate: (view: WebviewElement) => void): void {
+		if (this._webviewWidget) {
+			this._webviewWidget.dispose();
+		}
+
+		this._webviewWidget = this.instantiationService.createInstance(WebviewWidget, this.editor, delegate);
+		this._webviewWidget.show({ lineNumber, column: 1 }, 20);
+		// this.webviewWidgetVisible.set(true);
+	}
+
+	public closeWebviewWidget(): void {
+		if (this._webviewWidget) {
+			this._webviewWidget.dispose();
+			this._webviewWidget = null;
+			// this.webviewWidgetVisible.reset();
+			this.editor.focus();
+		}
+	}
+
+	getId(): string {
+		return EDITOR_CONTRIBUTION_ID;
+	}
+
+	dispose(): void {
+		this.closeWebviewWidget();
+	}
+}
+
+registerEditorContribution(WebviewWidgetContribution);
\ No newline at end of file

From c810428647b9429d16f3086572e266fd5328f345 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 6 Apr 2018 13:52:38 -0700
Subject: [PATCH 381/383] Fix compile error

---
 src/vs/workbench/api/electron-browser/mainThreadWebview.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 04052285280..8d3ed04b6db 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -138,7 +138,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		if (editor && editor.getControl()) {
 			(editor.getControl() as ICodeEditor).getContribution<WebviewWidgetContribution>(EDITOR_CONTRIBUTION_ID).showWebviewWidget(lineNumber, 0, webview => {
 				this._webviews.set(handle, webview);
-				webview.onDidClickLink(uri => this.onDidClickLink(uri, webview.options));
+				webview.onDidClickLink(uri => this.onDidClickLink(handle, uri));
 				webview.onMessage(message => this._proxy.$onMessage(handle, message));
 			});
 		}

From 89d6db5c862a8d6fe58c558305f079922b4abb0c Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 6 Apr 2018 14:15:07 -0700
Subject: [PATCH 382/383] Show at a specific position

---
 .../api/electron-browser/mainThreadWebview.ts  |  5 +++--
 src/vs/workbench/api/node/extHost.api.impl.ts  |  2 +-
 src/vs/workbench/api/node/extHost.protocol.ts  |  2 +-
 src/vs/workbench/api/node/extHostWebview.ts    |  8 ++++----
 .../webview/electron-browser/webviewWidget.ts  | 18 ++++++++++--------
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 8d3ed04b6db..d1717c048be 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -22,6 +22,7 @@ import { ICodeEditor } from '../../../editor/browser/editorBrowser';
 import { EDITOR_CONTRIBUTION_ID, WebviewWidgetContribution } from '../../parts/webview/electron-browser/webviewWidget';
 import { extHostNamedCustomer } from './extHostCustomers';
 import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
+import { IPosition } from 'vs/editor/common/core/position';
 
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
 export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviver {
@@ -133,10 +134,10 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		this._revivers.delete(viewType);
 	}
 
-	$showWebviewWidget(handle: WebviewHandle, editorId: string, lineNumber: number, viewType: string, options: WebviewInputOptions): void {
+	$showWebviewWidget(handle: WebviewHandle, editorId: string, position: IPosition, viewType: string, options: WebviewInputOptions): void {
 		const editor = this._editorService.getActiveEditor();
 		if (editor && editor.getControl()) {
-			(editor.getControl() as ICodeEditor).getContribution<WebviewWidgetContribution>(EDITOR_CONTRIBUTION_ID).showWebviewWidget(lineNumber, 0, webview => {
+			(editor.getControl() as ICodeEditor).getContribution<WebviewWidgetContribution>(EDITOR_CONTRIBUTION_ID).showWebviewWidget(position, webview => {
 				this._webviews.set(handle, webview);
 				webview.onDidClickLink(uri => this.onDidClickLink(handle, uri));
 				webview.onMessage(message => this._proxy.$onMessage(handle, message));
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 80e479583b5..b7a60c3ddac 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -423,7 +423,7 @@ export function createApiFactory(
 				return extHostWebviews.registerWebviewSerializer(viewType, serializer);
 			}),
 			showWebviewWidget: proposedApiFunction(extension, (editor: vscode.TextEditor, position: vscode.Position, viewType: string, title: string, options: vscode.WebviewOptions) => {
-				return extHostWebviews.showWebviewWidget(editor, position.line, viewType, title, options);
+				return extHostWebviews.showWebviewWidget(editor, position, viewType, title, options);
 			})
 		};
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 8529238873c..06940f57053 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -360,7 +360,7 @@ export interface MainThreadWebviewsShape extends IDisposable {
 	$registerSerializer(viewType: string): void;
 	$unregisterSerializer(viewType: string): void;
 
-	$showWebviewWidget(handle: WebviewHandle, editorId: string, lineNumber: number, viewType: string, options: vscode.WebviewOptions): void;
+	$showWebviewWidget(handle: WebviewHandle, editorId: string, position: IPosition, viewType: string, options: vscode.WebviewOptions): void;
 }
 
 export interface ExtHostWebviewsShape {
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 5746e13bb29..6ddf8382e36 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -9,7 +9,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import { Position } from 'vs/platform/editor/common/editor';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Disposable } from './extHostTypes';
+import * as types from './extHostTypes';
 import { ExtHostTextEditor } from './extHostTextEditor';
 
 export class ExtHostWebview implements vscode.Webview {
@@ -173,15 +173,15 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		this._serializers.set(viewType, serializer);
 		this._proxy.$registerSerializer(viewType);
 
-		return new Disposable(() => {
+		return new types.Disposable(() => {
 			this._serializers.delete(viewType);
 			this._proxy.$unregisterSerializer(viewType);
 		});
 	}
 
-	async showWebviewWidget(editor: vscode.TextEditor, lineNumber: number, viewType: string, title: string, options: vscode.WebviewOptions) {
+	async showWebviewWidget(editor: vscode.TextEditor, position: vscode.Position, viewType: string, title: string, options: vscode.WebviewOptions) {
 		const handle = ExtHostWebviews.webviewHandlePool++ + '';
-		this._proxy.$showWebviewWidget(handle, (editor as ExtHostTextEditor).id, lineNumber, viewType, options);
+		this._proxy.$showWebviewWidget(handle, (editor as ExtHostTextEditor).id, typeConverters.fromPosition(new types.Position(position.line, position.character)), viewType, options);
 
 		const webview = new ExtHostWebview(handle, this._proxy, viewType, undefined, options);
 		this._webviews.set(handle, webview);
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts b/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
index 78e33ac2a0f..05e5c76f6fe 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
@@ -13,14 +13,16 @@ import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webv
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IPosition } from 'vs/editor/common/core/position';
 
 export const EDITOR_CONTRIBUTION_ID = 'editor.contrib.webview';
 
 export class WebviewWidget extends ZoneWidget {
 
 	private _webview: WebviewElement;
+	private _scrollable: DomScrollableElement;
 
 	constructor(
 		editor: ICodeEditor,
@@ -53,16 +55,16 @@ export class WebviewWidget extends ZoneWidget {
 			});
 		this._webview.mountTo(container);
 
-		const e = new DomScrollableElement(this._webview.getDomNode(), {});
-		e.getDomNode().style.width = '100%';
-		e.getDomNode().style.height = '100%';
-		container.appendChild(e.getDomNode());
+		this._scrollable = new DomScrollableElement(this._webview.getDomNode(), {});
+		this._scrollable.getDomNode().style.width = '100%';
+		this._scrollable.getDomNode().style.height = '100%';
+		container.appendChild(this._scrollable.getDomNode());
 		this._delegate(this._webview);
 	}
 }
 
 export interface IWebviewWidgetContribution extends IEditorContribution {
-	showWebviewWidget(lineNumber: number, column: number, delegate: (view: WebviewElement) => void): void;
+	showWebviewWidget(position: IPosition, delegate: (view: WebviewElement) => void): void;
 	closeWebviewWidget(): void;
 }
 
@@ -75,13 +77,13 @@ export class WebviewWidgetContribution implements IWebviewWidgetContribution {
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { }
 
-	showWebviewWidget(lineNumber: number, column: number, delegate: (view: WebviewElement) => void): void {
+	showWebviewWidget(position: IPosition, delegate: (view: WebviewElement) => void): void {
 		if (this._webviewWidget) {
 			this._webviewWidget.dispose();
 		}
 
 		this._webviewWidget = this.instantiationService.createInstance(WebviewWidget, this.editor, delegate);
-		this._webviewWidget.show({ lineNumber, column: 1 }, 20);
+		this._webviewWidget.show(position, 20);
 		// this.webviewWidgetVisible.set(true);
 	}
 

From 7fa3fa23c5f232d1bd61c74674b067b67f3d03c9 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 6 Apr 2018 14:54:59 -0700
Subject: [PATCH 383/383] Allow closing webview widgets

---
 .../workbench/parts/webview/common/webview.ts |  7 +++
 .../webview/electron-browser/webviewWidget.ts | 56 +++++++++++++++----
 2 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 src/vs/workbench/parts/webview/common/webview.ts

diff --git a/src/vs/workbench/parts/webview/common/webview.ts b/src/vs/workbench/parts/webview/common/webview.ts
new file mode 100644
index 00000000000..e6c1bd94c7d
--- /dev/null
+++ b/src/vs/workbench/parts/webview/common/webview.ts
@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+
+export const CONTEXT_WEBVIEW_WIDGET_VISIBLE = new RawContextKey<boolean>('webviewWidgetVisible', false);
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts b/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
index 05e5c76f6fe..e546eeb0d02 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewWidget.ts
@@ -2,20 +2,24 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
+import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
+import { KeyMod } from 'vs/base/common/keyCodes';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { EditorCommand, ServicesAccessor, registerEditorContribution, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
+import { IPosition } from 'vs/editor/common/core/position';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
+import { KeyCode } from 'vs/editor/editor.main';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { CONTEXT_WEBVIEW_WIDGET_VISIBLE } from 'vs/workbench/parts/webview/common/webview';
 import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPosition } from 'vs/editor/common/core/position';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 export const EDITOR_CONTRIBUTION_ID = 'editor.contrib.webview';
 
@@ -71,11 +75,15 @@ export interface IWebviewWidgetContribution extends IEditorContribution {
 
 export class WebviewWidgetContribution implements IWebviewWidgetContribution {
 	private _webviewWidget: WebviewWidget;
+	private _webviewWidgetVisible: IContextKey<boolean>;
 
 	constructor(
 		private editor: ICodeEditor,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
-	) { }
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		this._webviewWidgetVisible = CONTEXT_WEBVIEW_WIDGET_VISIBLE.bindTo(contextKeyService);
+	}
 
 	showWebviewWidget(position: IPosition, delegate: (view: WebviewElement) => void): void {
 		if (this._webviewWidget) {
@@ -84,14 +92,14 @@ export class WebviewWidgetContribution implements IWebviewWidgetContribution {
 
 		this._webviewWidget = this.instantiationService.createInstance(WebviewWidget, this.editor, delegate);
 		this._webviewWidget.show(position, 20);
-		// this.webviewWidgetVisible.set(true);
+		this._webviewWidgetVisible.set(true);
 	}
 
 	public closeWebviewWidget(): void {
 		if (this._webviewWidget) {
 			this._webviewWidget.dispose();
 			this._webviewWidget = null;
-			// this.webviewWidgetVisible.reset();
+			this._webviewWidgetVisible.reset();
 			this.editor.focus();
 		}
 	}
@@ -105,4 +113,30 @@ export class WebviewWidgetContribution implements IWebviewWidgetContribution {
 	}
 }
 
-registerEditorContribution(WebviewWidgetContribution);
\ No newline at end of file
+registerEditorContribution(WebviewWidgetContribution);
+
+
+class CloseWebviewWidgetCommand extends EditorCommand {
+
+	constructor() {
+		super({
+			id: 'closeWebviewWidget',
+			precondition: CONTEXT_WEBVIEW_WIDGET_VISIBLE,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: KeyCode.Escape,
+				secondary: [KeyMod.Shift | KeyCode.Escape]
+			}
+		});
+	}
+
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
+		const webviewContribution = editor.getContribution<IWebviewWidgetContribution>(EDITOR_CONTRIBUTION_ID);
+		if (webviewContribution) {
+			// if focus is in outer editor we need to use the debug contribution to close
+			return webviewContribution.closeWebviewWidget();
+		}
+	}
+}
+
+registerEditorCommand(new CloseWebviewWidgetCommand());